From 8dd7e309cb165d2eae7ea70e44ea1ca5648a44d2 Mon Sep 17 00:00:00 2001 From: MinSheng Lin Date: Wed, 2 Aug 2017 10:15:26 +0800 Subject: [PATCH] mon: using appName as monitor name on failover change monitor name prefix to appName on failover Monitor change assert result in failoverMon testing --- pkg/operator/mon/health.go | 2 +- pkg/operator/mon/mon_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/mon/health.go b/pkg/operator/mon/health.go index 47ae76df1..21779f505 100644 --- a/pkg/operator/mon/health.go +++ b/pkg/operator/mon/health.go @@ -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 { diff --git a/pkg/operator/mon/mon_test.go b/pkg/operator/mon/mon_test.go index 6a9e230bd..66278cb6b 100644 --- a/pkg/operator/mon/mon_test.go +++ b/pkg/operator/mon/mon_test.go @@ -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) {