Skip to content

Commit be05459

Browse files
committed
Fix a crash bug during CC shutdown process
actor_cancel should be thrown, otherwise the rest code can access invalid memory.
1 parent 6cc4170 commit be05459

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

fdbserver/Status.actor.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,6 +2708,9 @@ ACTOR Future<JsonBuilderObject> lockedStatusFetcher(Reference<AsyncVar<ServerDBI
27082708
try {
27092709
wait(tr.onError(e));
27102710
} catch (Error& e) {
2711+
if (e.code() == error_code_actor_cancelled)
2712+
throw;
2713+
27112714
incomplete_reasons->insert(format("Unable to determine if database is locked (%s).", e.what()));
27122715
break;
27132716
}

0 commit comments

Comments
 (0)