From b69d7adabcb932cd93b3c994d54ac7f665e1d71d Mon Sep 17 00:00:00 2001 From: Jingyu Zhou Date: Fri, 26 Apr 2019 13:35:18 -0700 Subject: [PATCH] Remove unused remoteRecovered from master server --- fdbserver/masterserver.actor.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp index 205b1dbc19..4d6122291d 100644 --- a/fdbserver/masterserver.actor.cpp +++ b/fdbserver/masterserver.actor.cpp @@ -1126,7 +1126,7 @@ ACTOR Future rejoinRequestHandler( Reference self ) { } } -ACTOR Future trackTlogRecovery( Reference self, Reference>> oldLogSystems, Promise remoteRecovered ) { +ACTOR Future trackTlogRecovery( Reference self, Reference>> oldLogSystems ) { state Future rejoinRequests = Never(); state DBRecoveryCount recoverCount = self->cstate.myDBState.recoveryCount + 1; loop { @@ -1170,10 +1170,6 @@ ACTOR Future trackTlogRecovery( Reference self, ReferenceregistrationTrigger.trigger(); - if(allLogs && remoteRecovered.canBeSet()) { - remoteRecovered.send(Void()); - } - if( finalUpdate ) { oldLogSystems->get()->stopRejoins(); rejoinRequests = rejoinRequestHandler(self); @@ -1386,8 +1382,7 @@ ACTOR Future masterCore( Reference self ) { // we made to the new Tlogs (self->recoveryTransactionVersion), and only our own semi-commits can come between our // first commit and the next new TLogs - state Promise remoteRecovered; - self->addActor.send( trackTlogRecovery(self, oldLogSystems, remoteRecovered) ); + self->addActor.send( trackTlogRecovery(self, oldLogSystems) ); debug_advanceMaxCommittedVersion(UID(), self->recoveryTransactionVersion); wait(self->cstateUpdated.getFuture()); debug_advanceMinCommittedVersion(UID(), self->recoveryTransactionVersion);