wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a wait(delay(0)) to storage server termination to avoid a rare segfault

This commit is contained in:
Jon Fu 2021-11-02 16:24:40 -04:00
parent 9ab14d8577
commit 67bd4ddea0
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fdbserver/storageserver.actor.cpp
View File

@ -6110,9 +6110,16 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
// (ClusterController, and from there to the DataDistributionTeamCollection) // (ClusterController, and from there to the DataDistributionTeamCollection)
if (!recruitReply.isSet()) if (!recruitReply.isSet())
recruitReply.sendError(recruitment_failed()); recruitReply.sendError(recruitment_failed());
if (storageServerTerminated(self, persistentData, e)) if (e.code() == error_code_actor_cancelled)
return Void();
throw e; throw e;
// If the storage server dies while something that uses self is still on the stack,
// we want that actor to complete before we terminate and that memory goes out of scope
state Error err = e;
wait(delay(0));
if (storageServerTerminated(self, persistentData, err))
return Void();
throw err;
} }
} }
@ -6320,9 +6327,17 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
} catch (Error& e) { } catch (Error& e) {
if (recovered.canBeSet()) if (recovered.canBeSet())
recovered.send(Void()); recovered.send(Void());
if (storageServerTerminated(self, persistentData, e))
return Void(); if (e.code() == error_code_actor_cancelled)
throw e; throw e;
// If the storage server dies while something that uses self is still on the stack,
// we want that actor to complete before we terminate and that memory goes out of scope
state Error err = e;
wait(delay(0));
if (storageServerTerminated(self, persistentData, err))
return Void();
throw err;
} }
} }