diff options
-rw-r--r-- | src/mongo/util/fail_point.cpp | 7 | ||||
-rw-r--r-- | src/mongo/util/fail_point.h | 5 | ||||
-rw-r--r-- | src/mongo/util/fail_point_registry.cpp | 2 | ||||
-rw-r--r-- | src/mongo/util/fail_point_service.cpp | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/mongo/util/fail_point.cpp b/src/mongo/util/fail_point.cpp index ddd50d320ad..5755620be7a 100644 --- a/src/mongo/util/fail_point.cpp +++ b/src/mongo/util/fail_point.cpp @@ -119,7 +119,10 @@ void FailPoint::sync() const { } } -void FailPoint::setMode(Mode mode, ValType val, const BSONObj& extra) { +void FailPoint::setMode(Mode mode, + ValType val, + const BSONObj& extra, + const SyncConfig& syncConfig) { /** * Outline: * @@ -146,6 +149,8 @@ void FailPoint::setMode(Mode mode, ValType val, const BSONObj& extra) { if (_mode != off) { enableFailPoint(); } + + _syncConfig = syncConfig; } const BSONObj& FailPoint::getData() const { diff --git a/src/mongo/util/fail_point.h b/src/mongo/util/fail_point.h index 421959a63bd..fbabb169ffc 100644 --- a/src/mongo/util/fail_point.h +++ b/src/mongo/util/fail_point.h @@ -172,7 +172,10 @@ public: * that can be referenced afterwards with #getData. Defaults to an empty * document. */ - void setMode(Mode mode, ValType val = 0, const BSONObj& extra = BSONObj()); + void setMode(Mode mode, + ValType val = 0, + const BSONObj& extra = BSONObj(), + const SyncConfig& syncConfig = SyncConfig()); /** * @returns a BSON object showing the current mode and data stored. diff --git a/src/mongo/util/fail_point_registry.cpp b/src/mongo/util/fail_point_registry.cpp index e304b936a27..4108fdc897c 100644 --- a/src/mongo/util/fail_point_registry.cpp +++ b/src/mongo/util/fail_point_registry.cpp @@ -102,7 +102,7 @@ Status FailPointServerParameter::setFromString(const std::string& str) { FailPoint::SyncConfig syncConfig; std::tie(mode, val, data, syncConfig) = std::move(swParsedOptions.getValue()); - _data->setMode(mode, val, data); + _data->setMode(mode, val, data, syncConfig); return Status::OK(); } diff --git a/src/mongo/util/fail_point_service.cpp b/src/mongo/util/fail_point_service.cpp index 6c2941f3b5a..20b7baf5e5c 100644 --- a/src/mongo/util/fail_point_service.cpp +++ b/src/mongo/util/fail_point_service.cpp @@ -75,7 +75,7 @@ void setGlobalFailPoint(const std::string& failPointName, const BSONObj& cmdObj) FailPoint::SyncConfig syncConfig; std::tie(mode, val, data, syncConfig) = uassertStatusOK(FailPoint::parseBSON(cmdObj)); - failPoint->setMode(mode, val, data); + failPoint->setMode(mode, val, data, syncConfig); warning() << "failpoint: " << failPointName << " set to: " << failPoint->toBSON(); } |