diff options
| author | Andrew Shuvalov <andrew.shuvalov@mongodb.com> | 2021-12-27 23:12:07 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-28 23:18:25 +0000 |
| commit | 11649132c8a89b81ed9031166b8aad88c89a1495 (patch) | |
| tree | 53abcfdc69fc595411f56a7c5f9a97cc73bd3f88 | |
| parent | c3707e4b508b3e69f3146e068b01dac88c9106c3 (diff) | |
| download | mongo-11649132c8a89b81ed9031166b8aad88c89a1495.tar.gz | |
SERVER-59397 fixed backport merge conflict and used the token for extra safety
| -rw-r--r-- | src/mongo/db/process_health/fault_manager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/process_health/fault_manager.cpp b/src/mongo/db/process_health/fault_manager.cpp index 90d9ecf57f2..2dadbfdd2b1 100644 --- a/src/mongo/db/process_health/fault_manager.cpp +++ b/src/mongo/db/process_health/fault_manager.cpp @@ -438,12 +438,14 @@ void FaultManager::healthCheck(HealthObserver* observer, std::shared_ptr<AtomicW 1, "Fault manager received an error", "status"_attr = cbData.status); - if (ErrorCodes::isA<ErrorCategory::CancellationError>(cbData.status.code())) { + if (ErrorCodes::isA<ErrorCategory::CancelationError>(cbData.status.code())) { return; } // continue health checking otherwise } - healthCheck(observer, token); + if (!token->load()) { + healthCheck(observer, token); + } }); if (!periodicThreadCbHandleStatus.isOK()) { |