repair slave of master when master referent conflict

polefishu · polefishu · commit d8b3fe7ccaef · 2020-01-19T17:48:20.000+08:00
diff --git a/pkg/controller/clustering/placement_v2.go b/pkg/controller/clustering/placement_v2.go
@@ -118,7 +118,9 @@ func (c *Ctx) PlaceSlaves() error {
 			}
 			if node.GetRole() == redisv1alpha1.RedisClusterNodeRoleSlave {
 				if node.MasterReferent != master.ID {
-					return fmt.Errorf("master referent conflict, %s:%s vs %s:%s", node.MasterReferent, node.IP, master.ID, master.IP)
+					c.log.Error(nil, "master referent conflict", "node ip", node.IP,
+						"current masterID", node.MasterReferent, "expect masterID", master.ID, "master IP", master.IP)
+					c.slavesByMaster[master.ID] = append(c.slavesByMaster[master.ID], node)
 				}
 				continue
 			}

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ func (c *Ctx) PlaceSlaves() error {`
`118`	`118`	`}`
`119`	`119`	`if node.GetRole() == redisv1alpha1.RedisClusterNodeRoleSlave {`
`120`	`120`	`if node.MasterReferent != master.ID {`
`121`		`- return fmt.Errorf("master referent conflict, %s:%s vs %s:%s", node.MasterReferent, node.IP, master.ID, master.IP)`
	`121`	`+ c.log.Error(nil, "master referent conflict", "node ip", node.IP,`
	`122`	`+ "current masterID", node.MasterReferent, "expect masterID", master.ID, "master IP", master.IP)`
	`123`	`+ c.slavesByMaster[master.ID] = append(c.slavesByMaster[master.ID], node)`
`122`	`124`	`}`
`123`	`125`	`continue`
`124`	`126`	`}`