From a89d435d8ea2369617a951a975f13a4a639a0eba Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 21 Mar 2013 17:13:08 +0100 Subject: [PATCH] Cluster: move slotToKeyFlush() to emptyDb(). This way we are sure to destroy the slot->key map every time we destroy the DB, for instance when reloading a DB due to replication. --- src/db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/db.c b/src/db.c index 3f85d43a..534feba0 100644 --- a/src/db.c +++ b/src/db.c @@ -178,6 +178,7 @@ long long emptyDb() { dictEmpty(server.db[j].dict); dictEmpty(server.db[j].expires); } + if (server.cluster_enabled) slotToKeyFlush(); return removed; } @@ -221,7 +222,6 @@ void flushdbCommand(redisClient *c) { void flushallCommand(redisClient *c) { signalFlushedDb(-1); server.dirty += emptyDb(); - if (server.cluster_enabled) slotToKeyFlush(); addReply(c,shared.ok); if (server.rdb_child_pid != -1) { kill(server.rdb_child_pid,SIGUSR1);