From 6e619e9157474ad9c6263544540f596f27720de1 Mon Sep 17 00:00:00 2001 From: Chaoguang Lin Date: Mon, 25 Jan 2021 00:41:50 -0800 Subject: [PATCH] Update the returned future when local client is disabled --- fdbclient/MultiVersionTransaction.actor.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp index 52cb869727..b1eef60004 100644 --- a/fdbclient/MultiVersionTransaction.actor.cpp +++ b/fdbclient/MultiVersionTransaction.actor.cpp @@ -816,10 +816,8 @@ ThreadFuture MultiVersionDatabase::rebootWorker(const StringRef& addres } ThreadFuture MultiVersionDatabase::forceRecoveryWithDataLoss(const StringRef &dcid) { - if (dbState->db) { - return dbState->db->forceRecoveryWithDataLoss(dcid); - } - return Void(); + auto f = dbState->db ? dbState->db->forceRecoveryWithDataLoss(dcid) : ThreadFuture(Never()); + return abortableFuture(f, dbState->dbVar->get().onChange); } void MultiVersionDatabase::Connector::connect() {