mon: using appName as monitor name on failover

change monitor name prefix to appName on failover Monitor
change assert result in failoverMon testing
This commit is contained in:
MinSheng Lin
2017-08-02 10:29:01 +08:00
parent 56b65dba91
commit 8dd7e309cb
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -105,7 +105,7 @@ func (c *Cluster) failoverMon(name string) error {
logger.Infof("Failing over monitor %s", name)
// Start a new monitor
mons := []*monConfig{{Name: fmt.Sprintf("mon%d", c.maxMonID+1), Port: int32(mon.Port)}}
mons := []*monConfig{{Name: fmt.Sprintf("%s%d", appName, c.maxMonID+1), Port: int32(mon.Port)}}
logger.Infof("starting new mon %s", mons[0].Name)
err := c.startPods(mons)
if err != nil {
+1 -1
View File
@@ -149,7 +149,7 @@ func TestCheckHealth(t *testing.T) {
cm, err := c.context.Clientset.CoreV1().ConfigMaps(c.Namespace).Get("mon-config", metav1.GetOptions{})
assert.Nil(t, err)
assert.Equal(t, "mon11=:6790", cm.Data["endpoints"])
assert.Equal(t, "rook-ceph-mon11=:6790", cm.Data["endpoints"])
}
func TestMonInQuourm(t *testing.T) {