alsoPropagate(): just propagate() when out of context.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/server.c b/src/server.c
index e02b1b93e..80270af4d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3110,7 +3110,10 @@ void propagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
  * The function does not take a reference to the passed 'argv' vector,
  * so it is up to the caller to release the passed argv (but it is usually
  * stack allocated).  The function autoamtically increments ref count of
- * passed objects, so the caller does not need to. */
+ * passed objects, so the caller does not need to.
+ *
+ * Note that if we are outside the execution of a command, that is we
+ * are not inside call(), this function will just act like propagate(). */
 void alsoPropagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
                    int target)
 {
@@ -3119,6 +3122,13 @@ void alsoPropagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
 
     if (server.loading) return; /* No propagation during loading. */
 
+    /* Just call propagate() if we are out of the scope of a command.
+     * For asynchronous operations usually we want to propagate immediately. */
+    if (server.current_client == NULL) {
+        propagate(cmd,dbid,argv,argc,target);
+        return;
+    }
+
     argvcopy = zmalloc(sizeof(robj*)*argc);
     for (j = 0; j < argc; j++) {
         argvcopy[j] = argv[j];