Merge pull request #92 from Snapchat/fix_sync_cancel_race
Fix a race when undoConnectWithMaster changes mi->repl_transfer_s but…
This commit is contained in:
commit
1f741154f1
@ -2980,7 +2980,7 @@ void readSyncBulkPayload(connection *conn) {
|
|||||||
rdbSaveInfo rsi;
|
rdbSaveInfo rsi;
|
||||||
redisMaster *mi = (redisMaster*)connGetPrivateData(conn);
|
redisMaster *mi = (redisMaster*)connGetPrivateData(conn);
|
||||||
static int usemark = 0;
|
static int usemark = 0;
|
||||||
if (mi == nullptr) {
|
if (mi == nullptr || conn != mi->repl_transfer_s) {
|
||||||
// We're about to be free'd so bail out
|
// We're about to be free'd so bail out
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user