From 0df763f17ddd90f18195da80512a96e4f45409fe Mon Sep 17 00:00:00 2001
From: Kshitij Gupta <kshitij.gupta@mongodb.com>
Date: Mon, 20 Dec 2021 22:46:17 +0000
Subject: SERVER-62197: Get rid of potential deadlock.

(cherry picked from commit 60c56d04a121194e16884eed520eb0676cbf0261)
---
 src/mongo/db/process_health/fault_manager.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/mongo/db/process_health/fault_manager.cpp')

diff --git a/src/mongo/db/process_health/fault_manager.cpp b/src/mongo/db/process_health/fault_manager.cpp
index 71b82141aa5..6a1a50eda7d 100644
--- a/src/mongo/db/process_health/fault_manager.cpp
+++ b/src/mongo/db/process_health/fault_manager.cpp
@@ -311,8 +311,7 @@ boost::optional<FaultState> FaultManager::handleOk(const OptionalMessageType& me
         logMessageReceived(state(), status);
     }
 
-    if (_config->getHealthObserverIntensity(status.getType()) ==
-        HealthObserverIntensityEnum::kOff) {
+    if (!_config->isHealthObserverEnabled(status.getType())) {
         return boost::none;
     }
 
@@ -473,7 +472,6 @@ SharedSemiFuture<void> FaultManager::startPeriodicHealthChecks() {
 }
 
 FaultState FaultManager::getFaultState() const {
-    stdx::lock_guard<Latch> lk(_stateMutex);
     return state();
 }
 
@@ -664,8 +662,7 @@ std::vector<HealthObserver*> FaultManager::getActiveHealthObservers() const {
     std::vector<HealthObserver*> result;
     result.reserve(allObservers.size());
     for (auto observer : allObservers) {
-        if (_config->getHealthObserverIntensity(observer->getType()) !=
-            HealthObserverIntensityEnum::kOff) {
+        if (_config->isHealthObserverEnabled(observer->getType())) {
             result.push_back(observer);
         }
     }
-- 
cgit v1.2.1