gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Former-commit-id: a19d0f67b9fffefd9029b9a2ef3358b110302bbf
This commit is contained in:
John Sully 2019-07-15 14:55:41 -04:00
parent add714913b
commit 20cfb91f3f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/replication.cpp
View File

@ -2198,8 +2198,10 @@ int connectWithMaster(redisMaster *mi) {
void undoConnectWithMaster(redisMaster *mi) { void undoConnectWithMaster(redisMaster *mi) {
int fd = mi->repl_transfer_s; int fd = mi->repl_transfer_s;
aeDeleteFileEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,fd,AE_READABLE|AE_WRITABLE); aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [fd]{
close(fd); aeDeleteFileEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,fd,AE_READABLE|AE_WRITABLE);
close(fd);
});
mi->repl_transfer_s = -1; mi->repl_transfer_s = -1;
} }