Cluster: separate unknown master check from the rest.

In no case we should try to attempt to failover if myself->slaveof is NULL.
ls0618 · Mar 21, 2015 · 47bbaa1 · 47bbaa1
1 parent 0595420
commit 47bbaa1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/cluster.c b/src/cluster.c
@@ -4176,9 +4176,12 @@ void clusterCommand(redisClient *c) {
         if (nodeIsMaster(myself)) {
             addReplyError(c,"You should send CLUSTER FAILOVER to a slave");
             return;
+        } else if (myself->slaveof == NULL) {
+            addReplyError(c,"I'm a slave but my master is unknown to me");
+            return;
         } else if (!force &&
-                   (myself->slaveof == NULL || nodeFailed(myself->slaveof) ||
-                   myself->slaveof->link == NULL))
+                   (nodeFailed(myself->slaveof) ||
+                    myself->slaveof->link == NULL))
         {
             addReplyError(c,"Master is down or failed, "
                             "please use CLUSTER FAILOVER FORCE");