summaryrefslogtreecommitdiff
path: root/src/mongo/db/process_health/fault_manager.cpp
diff options
context:
space:
mode:
authorKshitij Gupta <kshitij.gupta@mongodb.com>2021-12-20 22:46:17 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-12-29 01:30:33 +0000
commit0df763f17ddd90f18195da80512a96e4f45409fe (patch)
tree77a7912225217508db718a551f49e275fbfeb5ab /src/mongo/db/process_health/fault_manager.cpp
parent1b354812d9f2a22b1c6286c26cc4ce953fbd7a1c (diff)
downloadmongo-0df763f17ddd90f18195da80512a96e4f45409fe.tar.gz
SERVER-62197: Get rid of potential deadlock.
(cherry picked from commit 60c56d04a121194e16884eed520eb0676cbf0261)
Diffstat (limited to 'src/mongo/db/process_health/fault_manager.cpp')
-rw-r--r--src/mongo/db/process_health/fault_manager.cpp7
1 files changed, 2 insertions, 5 deletions
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);
}
}