diff --git a/src/multi.c b/src/multi.c index ba8baf0a22b35088756994276a266f829ad7203b..2ceca8caf464ee319afe27453c6157ef34a4dde4 100644 --- a/src/multi.c +++ b/src/multi.c @@ -103,12 +103,11 @@ void discardCommand(redisClient *c) { /* Send a MULTI command to all the slaves and AOF file. Check the execCommand * implementation for more information. */ -void execCommandReplicateMulti(redisClient *c) { +void execCommandPropagateMulti(redisClient *c) { robj *multistring = createStringObject("MULTI",5); - if (server.aof_state != REDIS_AOF_OFF) - feedAppendOnlyFile(server.multiCommand,c->db->id,&multistring,1); - replicationFeedSlaves(server.slaves,c->db->id,&multistring,1); + propagate(server.multiCommand,c->db->id,&multistring,1, + REDIS_PROPAGATE_AOF|REDIS_PROPAGATE_REPL); decrRefCount(multistring); } @@ -139,11 +138,11 @@ void execCommand(redisClient *c) { goto handle_monitor; } - /* Replicate a MULTI request now that we are sure the block is executed. + /* Propagate a MULTI request now that we are sure the block is executed. * This way we'll deliver the MULTI/..../EXEC block as a whole and * both the AOF and the replication link will have the same consistency * and atomicity guarantees. */ - execCommandReplicateMulti(c); + execCommandPropagateMulti(c); /* Exec all the queued commands */ unwatchAllKeys(c); /* Unwatch ASAP otherwise we'll waste CPU cycles */