apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-01 18:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11399 from jzhou77/release-notes

Browse Source 
Fix an assertion failure when waiting for recovery
This commit is contained in:
Jingyu Zhou 2024-05-14 15:23:24 -07:00 committed by GitHub
commit ede22972c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fdbserver/ClusterController.actor.cpp
View File

@ -328,6 +328,13 @@ ACTOR Future<Void> clusterWatchDatabase(ClusterControllerData* cluster,
recoveryCore.cancel();
wait(cleanupRecoveryActorCollection(db->recoveryData, /*exThrown=*/true));
ASSERT(addActor.isEmpty());
if (cluster->outstandingRemoteRequestChecker.isValid()) {
cluster->outstandingRemoteRequestChecker.cancel();
}
if (cluster->outstandingRequestChecker.isValid()) {
cluster->outstandingRequestChecker.cancel();
}
CODE_PROBE(err.code() == error_code_tlog_failed, "Terminated due to tLog failure");
CODE_PROBE(err.code() == error_code_commit_proxy_failed, "Terminated due to commit proxy failure");