Crash when aborting SYNC with a master on a thread other than main

Snapchat · Jul 15, 2019 · a19d0f6 · a19d0f6
1 parent 971f69f
commit a19d0f6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/replication.cpp b/src/replication.cpp
@@ -2198,8 +2198,10 @@ int connectWithMaster(redisMaster *mi) {
 void undoConnectWithMaster(redisMaster *mi) {
     int fd = mi->repl_transfer_s;
 
-    aeDeleteFileEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,fd,AE_READABLE|AE_WRITABLE);
-    close(fd);
+    aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [fd]{
+        aeDeleteFileEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,fd,AE_READABLE|AE_WRITABLE);
+        close(fd);
+    });
     mi->repl_transfer_s = -1;
 }