SERVER-66996 Log warnings when ReplicaSetAwareServices and PrimaryOnlyServices block stepUp from completing

9 files changed, 28 insertions, 0 deletions

diff --git a/src/mongo/db/s/balancer/balancer.h b/src/mongo/db/s/balancer/balancer.h
index 9e08037c8f1..592204e9bb4 100644
--- a/src/mongo/db/s/balancer/balancer.h
+++ b/src/mongo/db/s/balancer/balancer.h
@@ -173,6 +173,9 @@ private:
     void onStepUpComplete(OperationContext* opCtx, long long term) final;
     void onStepDown() final;
     void onBecomeArbiter() final;
+    inline std::string getServiceName() const override final {
+        return "Balancer";
+    }
 
     /**
      * The main balancer loop, which runs in a separate thread.
diff --git a/src/mongo/db/s/balancer_stats_registry.h b/src/mongo/db/s/balancer_stats_registry.h
index aa495fae56c..a5effc6b0e2 100644
--- a/src/mongo/db/s/balancer_stats_registry.h
+++ b/src/mongo/db/s/balancer_stats_registry.h
@@ -113,6 +113,9 @@ private:
     void onStartup(OperationContext* opCtx) override final;
     void onStepUpComplete(OperationContext* opCtx, long long term) override final;
     void onStepDown() override final;
+    inline std::string getServiceName() const override final {
+        return "BalancerStatsRegistry";
+    }
 
     void _loadOrphansCount(OperationContext* opCtx);
     bool _isInitialized() const {
diff --git a/src/mongo/db/s/migration_destination_manager.h b/src/mongo/db/s/migration_destination_manager.h
index 827a0206b80..49d1daa0eb8 100644
--- a/src/mongo/db/s/migration_destination_manager.h
+++ b/src/mongo/db/s/migration_destination_manager.h
@@ -279,6 +279,9 @@ private:
     void onStepUpComplete(OperationContext* opCtx, long long term) final {}
     void onStepDown() final;
     void onBecomeArbiter() final {}
+    inline std::string getServiceName() const override final {
+        return "MigrationDestinationManager";
+    }
 
     // The number of session oplog entries recieved from the source shard. Not all oplog
     // entries recieved from the source shard may be committed
diff --git a/src/mongo/db/s/query_analysis_coordinator.h b/src/mongo/db/s/query_analysis_coordinator.h
index 2525bdcbef5..c275c059c85 100644
--- a/src/mongo/db/s/query_analysis_coordinator.h
+++ b/src/mongo/db/s/query_analysis_coordinator.h
@@ -153,6 +153,10 @@ private:
 
     void onBecomeArbiter() override final {}
 
+    inline std::string getServiceName() const override final {
+        return "QueryAnalysisCoordinator";
+    }
+
     /**
      * Returns the minimum last ping time for a sampler to be considered as active.
      */
diff --git a/src/mongo/db/s/query_analysis_writer.h b/src/mongo/db/s/query_analysis_writer.h
index 3ea38483b09..c197e15bdb1 100644
--- a/src/mongo/db/s/query_analysis_writer.h
+++ b/src/mongo/db/s/query_analysis_writer.h
@@ -139,6 +139,9 @@ public:
     void onStartup(OperationContext* opCtx);
     void onShutdown();
     void onStepUpComplete(OperationContext* opCtx, long long term);
+    inline std::string getServiceName() const override final {
+        return "QueryAnalysisWriter";
+    }
 
     ExecutorFuture<void> createTTLIndexes(OperationContext* opCtx);
 
diff --git a/src/mongo/db/s/range_deleter_service.h b/src/mongo/db/s/range_deleter_service.h
index 93baaf76b70..90745568ce1 100644
--- a/src/mongo/db/s/range_deleter_service.h
+++ b/src/mongo/db/s/range_deleter_service.h
@@ -239,6 +239,9 @@ public:
     void onStepUpComplete(OperationContext* opCtx, long long term) override;
     void onStepDown() override;
     void onShutdown() override;
+    inline std::string getServiceName() const override final {
+        return "RangeDeleterService";
+    }
 
     /*
      * Returns the RangeDeleterService state with the following schema:
diff --git a/src/mongo/db/s/sharding_initialization_mongod.h b/src/mongo/db/s/sharding_initialization_mongod.h
index 791d43f05c5..d11d6deaa32 100644
--- a/src/mongo/db/s/sharding_initialization_mongod.h
+++ b/src/mongo/db/s/sharding_initialization_mongod.h
@@ -125,6 +125,9 @@ private:
     void onStepUpComplete(OperationContext* opCtx, long long term) override final {}
     void onStepDown() override final {}
     void onBecomeArbiter() override final {}
+    inline std::string getServiceName() const override final {
+        return "ShardingInitializationMongoD";
+    }
 
 
     // This mutex ensures that only one thread at a time executes the sharding
diff --git a/src/mongo/db/s/sharding_recovery_service.h b/src/mongo/db/s/sharding_recovery_service.h
index 8127bd7ce33..3ba7a40f6e9 100644
--- a/src/mongo/db/s/sharding_recovery_service.h
+++ b/src/mongo/db/s/sharding_recovery_service.h
@@ -155,6 +155,9 @@ private:
     void onStepUpComplete(OperationContext* opCtx, long long term) override final {}
     void onStepDown() override final {}
     void onBecomeArbiter() override final {}
+    inline std::string getServiceName() const override final {
+        return "ShardingRecoveryService";
+    }
 };
 
 }  // namespace mongo
diff --git a/src/mongo/db/s/user_writes_recoverable_critical_section_service.h b/src/mongo/db/s/user_writes_recoverable_critical_section_service.h
index 5c72dddd6c4..9df6045575f 100644
--- a/src/mongo/db/s/user_writes_recoverable_critical_section_service.h
+++ b/src/mongo/db/s/user_writes_recoverable_critical_section_service.h
@@ -157,6 +157,9 @@ private:
     void onStepUpComplete(OperationContext* opCtx, long long term) override final {}
     void onStepDown() override final {}
     void onBecomeArbiter() override final {}
+    inline std::string getServiceName() const override final {
+        return "UserWritesRecoverableCriticalSectionService";
+    }
 };
 
 }  // namespace mongo