Unverified Commit b55c1602 authored by Kevin McGehee's avatar Kevin McGehee Committed by GitHub
Browse files

Call propagate instead of writing directly to AOF/replicas (#6658)

Use higher-level API to funnel all generic propagation through
single function call.
parent 7af05f07
...@@ -1228,9 +1228,7 @@ void propagateExpire(redisDb *db, robj *key, int lazy) { ...@@ -1228,9 +1228,7 @@ void propagateExpire(redisDb *db, robj *key, int lazy) {
incrRefCount(argv[0]); incrRefCount(argv[0]);
incrRefCount(argv[1]); incrRefCount(argv[1]);
if (server.aof_state != AOF_OFF) propagate(server.delCommand,db->id,argv,2,PROPAGATE_AOF|PROPAGATE_REPL);
feedAppendOnlyFile(server.delCommand,db->id,argv,2);
replicationFeedSlaves(server.slaves,db->id,argv,2);
decrRefCount(argv[0]); decrRefCount(argv[0]);
decrRefCount(argv[1]); decrRefCount(argv[1]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment