if there is slot migrating, proxy online should be allowed

CodisLabs · Aug 26, 2015 · 21044af · 21044af
1 parent 0c6d4f1
commit 21044af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/models/proxy.go b/pkg/models/proxy.go
@@ -160,8 +160,8 @@ func SetProxyStatus(zkConn zkhelper.Conn, productName string, proxyName string,
 			return errors.Trace(err)
 		}
 		for _, slot := range slots {
-			if slot.State.Status != SLOT_STATUS_ONLINE {
-				return errors.Errorf("slot %v is not online", slot)
+			if slot.State.Status != SLOT_STATUS_ONLINE && slot.State.Status != SLOT_STATUS_MIGRATE{
+				return errors.Errorf("slot %v is not online or migrate", slot)
 			}
 			if slot.GroupId == INVALID_ID {
 				return errors.Errorf("slot %v has invalid group id", slot)