From 640cee20725c11693e0a21bc6fba122e927ecd3f Mon Sep 17 00:00:00 2001 From: Suraj Gupta Date: Wed, 8 Dec 2021 14:12:44 -0500 Subject: [PATCH] Start BM without config change if config is enabled. --- fdbclient/Schemas.cpp | 2 +- fdbserver/ClusterController.actor.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp index d2725e8f5f..b9d6d9a72c 100644 --- a/fdbclient/Schemas.cpp +++ b/fdbclient/Schemas.cpp @@ -771,7 +771,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema( "aggressive", "gradual" ]}, - "blob_granules_enabled":1, + "blob_granules_enabled":0 }, "data":{ "least_operating_space_bytes_log_server":0, diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp index 226674d39e..d0949c2e23 100644 --- a/fdbserver/ClusterController.actor.cpp +++ b/fdbserver/ClusterController.actor.cpp @@ -5399,12 +5399,12 @@ ACTOR Future monitorBlobManager(ClusterControllerData* self) { } } } - } else { - wait(watchConfigChange); + } else if (self->db.config.blobGranulesEnabled) { // if there is no blob manager present but blob granules are now enabled, recruit a BM - if (self->db.config.blobGranulesEnabled) { - wait(startBlobManager(self)); - } + wait(startBlobManager(self)); + } else { + // if there is no blob manager present and blob granules are disabled, wait for a config change + wait(watchConfigChange); } } }