Active replicas memory leak

JohnSully · JohnSully · commit 22ac56d62d98 · 2020-09-22T21:38:35.000Z
diff --git a/src/db.cpp b/src/db.cpp
@@ -1395,7 +1395,7 @@ void setExpire(client *c, redisDb *db, robj *key, robj *subkey, long long when)
         db->setexpire->insert(e);
     }
 
-    int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0;
+    int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0 && !g_pserver->fActiveReplica;
     if (c && writable_slave && !(c->flags & CLIENT_MASTER))
         rememberSlaveKeyWithExpire(db,key);
 }
@@ -1432,7 +1432,7 @@ void setExpire(client *c, redisDb *db, robj *key, expireEntry &&e)
     ((robj*)dictGetVal(kde))->SetFExpires(true);
 
 
-    int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0;
+    int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0 && !g_pserver->fActiveReplica;
     if (c && writable_slave && !(c->flags & CLIENT_MASTER))
         rememberSlaveKeyWithExpire(db,key);
 }

Original file line number	Diff line number	Diff line change
`@@ -1395,7 +1395,7 @@ void setExpire(client c, redisDb db, robj key, robj subkey, long long when)`
`1395`	`1395`	`db->setexpire->insert(e);`
`1396`	`1396`	`}`
`1397`	`1397`
`1398`		`- int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0;`
	`1398`	`+ int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0 && !g_pserver->fActiveReplica;`
`1399`	`1399`	`if (c && writable_slave && !(c->flags & CLIENT_MASTER))`
`1400`	`1400`	`rememberSlaveKeyWithExpire(db,key);`
`1401`	`1401`	`}`
`@@ -1432,7 +1432,7 @@ void setExpire(client c, redisDb db, robj *key, expireEntry &&e)`
`1432`	`1432`	`((robj*)dictGetVal(kde))->SetFExpires(true);`
`1433`	`1433`
`1434`	`1434`
`1435`		`- int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0;`
	`1435`	`+ int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0 && !g_pserver->fActiveReplica;`
`1436`	`1436`	`if (c && writable_slave && !(c->flags & CLIENT_MASTER))`
`1437`	`1437`	`rememberSlaveKeyWithExpire(db,key);`
`1438`	`1438`	`}`