diff options
| author | Kshitij Gupta <kshitij.gupta@mongodb.com> | 2021-12-29 15:38:21 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-29 15:52:12 +0000 |
| commit | d0ded7415db2c2368bc6310282f37499ff27cbe5 (patch) | |
| tree | 706aee95c82ca0aee4d9276289564aa70393f451 | |
| parent | 7dee5b3d7b240e1161860436a5eeb688ee8a1e6f (diff) | |
| download | mongo-d0ded7415db2c2368bc6310282f37499ff27cbe5.tar.gz | |
SERVER-62291: Find replacement for skipValidatingExitCode in the 4.4 backport of the health monitor
| -rw-r--r-- | src/mongo/db/process_health/fault_state_machine_test.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/shell/servers.js | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/process_health/fault_state_machine_test.cpp b/src/mongo/db/process_health/fault_state_machine_test.cpp index 8080558aa3e..32141bdaa84 100644 --- a/src/mongo/db/process_health/fault_state_machine_test.cpp +++ b/src/mongo/db/process_health/fault_state_machine_test.cpp @@ -52,8 +52,7 @@ TEST_F(FaultManagerTest, TransitionsFromStartupCheckToOkWhenAllObserversAreSucce auto initialHealthCheckFuture = manager().startPeriodicHealthChecks(); std::vector<FaultFacetType> faultFacetTypes{FaultFacetType::kMock1, FaultFacetType::kMock2}; - // TODO(SERVER-62280): fix this - // ASSERT(manager().getFaultState() == FaultState::kStartupCheck); + ASSERT(manager().getFaultState() == FaultState::kStartupCheck); // send successful health check response from each for (auto faultFacetType : faultFacetTypes) { diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js index bafd7eb55f0..e9d87cc7edb 100644 --- a/src/mongo/shell/servers.js +++ b/src/mongo/shell/servers.js @@ -1029,7 +1029,7 @@ MongoRunner.stopMongod = function(conn, signal, opts, waitpid) { if (!waitpid) { return 0; } - if (allowedExitCode !== returnCode) { + if (allowedExitCode !== returnCode && !opts.skipValidatingExitCode) { throw new MongoRunner.StopError(returnCode); } else if (returnCode !== MongoRunner.EXIT_CLEAN) { print("MongoDB process on port " + port + " intentionally exited with error code ", |