diff --git a/src/cluster.c b/src/cluster.c index 71efe08bc3535509513552a00fda9dfe884fc26e..ee95f3759c8a3afee924ae9eb25c0b1fe487d8a3 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -2875,12 +2875,16 @@ void clusterCommand(redisClient *c) { /* CLUSTER FORGET */ clusterNode *n = clusterLookupNode(c->argv[2]->ptr); - if (n == server.cluster->myself) { - addReplyErrorFormat(c,"I tried hard but I can't forget myself..."); - return; - } else if (!n) { + if (!n) { addReplyErrorFormat(c,"Unknown node %s", (char*)c->argv[2]->ptr); return; + } else if (n == server.cluster->myself) { + addReplyError(c,"I tried hard but I can't forget myself..."); + return; + } else if (server.cluster->myself->flags & REDIS_NODE_SLAVE && + server.cluster->myself->slaveof == n) { + addReplyError(c,"Can't forget my master!"); + return; } clusterBlacklistAddNode(n); clusterDelNode(n);