Skip to content

Commit c97f8dd

Browse files
authored
Merge pull request #11407 from jzhou77/release-notes
Fix a segfault when tlog encounters platform_error
2 parents a5d3741 + fecffc9 commit c97f8dd

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

fdbserver/TLogServer.actor.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2548,6 +2548,10 @@ ACTOR Future<Void> rejoinClusterController(TLogData* self,
25482548
stoppedPromise.send(Void());
25492549
}
25502550

2551+
if (self->terminated.isSet()) {
2552+
return Void();
2553+
}
2554+
25512555
if (registerWithCC.isReady()) {
25522556
if (!lastMasterLifetime.isEqual(self->dbInfo->get().masterLifetime)) {
25532557
// The TLogRejoinRequest is needed to establish communications with a new master, which doesn't have our

0 commit comments

Comments
 (0)