diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index c9d17cb56e..188095d5d7 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -2040,6 +2040,7 @@ static std::set const& normalDDQueueErrors() { s.insert( error_code_broken_promise ); s.insert( error_code_master_recovery_failed ); s.insert( error_code_coordinated_state_conflict ); + s.insert( error_code_worker_removed ); } return s; } diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp index c6df7b6067..44035a5360 100644 --- a/fdbserver/TagPartitionedLogSystem.actor.cpp +++ b/fdbserver/TagPartitionedLogSystem.actor.cpp @@ -1505,7 +1505,7 @@ struct TagPartitionedLogSystem : ILogSystem, ReferenceCountedtLogs.size(); - req.startVersion = logSet->startVersion; + req.startVersion = std::max(self->tLogs[0]->startVersion, logSet->startVersion); logRouterInitializationReplies.push_back( transformErrors( throwErrorOr( remoteWorkers.logRouters[i].logRouter.getReplyUnlessFailedFor( req, SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY ) ), master_recovery_failed() ) ); }