From b108c1ea0d93d6318e5d9c71060d41d544aaa220 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Fri, 2 Jun 2017 11:27:37 -0700 Subject: [PATCH] fix: do not delay before setting logData->version --- fdbserver/TLogServer.actor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp index 9b0dc08652..41a242d8bf 100644 --- a/fdbserver/TLogServer.actor.cpp +++ b/fdbserver/TLogServer.actor.cpp @@ -1650,8 +1650,6 @@ ACTOR Future tLogStart( TLogData* self, InitializeTLogRequest req, Localit logData->removed = rejoinMasters(self, recruited, req.epoch); self->queueOrder.push_back(recruited.id()); - Void _ = wait( delay(0.0) ); // if multiple recruitment requests were already in the promise stream make sure they are all started before any are removed - TraceEvent("TLogStart", logData->logId); try { @@ -1686,6 +1684,8 @@ ACTOR Future tLogStart( TLogData* self, InitializeTLogRequest req, Localit throw; } + Void _ = wait( delay(0.0) ); // if multiple recruitment requests were already in the promise stream make sure they are all started before any are removed + double inputSum = 0; double durableSum = 0; for(auto it : self->id_data) { @@ -1709,7 +1709,7 @@ ACTOR Future tLogStart( TLogData* self, InitializeTLogRequest req, Localit if(self->id_data.size() || (self->oldLogServer.isValid() && !self->oldLogServer.isReady())) { return Void(); } else { - throw; + throw worker_removed(); } }