diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2019-09-10 19:03:36 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2019-09-10 19:03:36 +0000 |
commit | 5a0f718e1309a4484580d8038016d043ef3b887f (patch) | |
tree | 7a331d57ba6e33e61f96ed69b2aa387003a039ab /src/mongo/db/exec | |
parent | b9e29cd56ebc9aca06f68eeeda7c523d3dfd6d41 (diff) | |
download | mongo-5a0f718e1309a4484580d8038016d043ef3b887f.tar.gz |
SERVER-43119 FailPoint cleanup
- Don't use MONGO_INITIALIZER to declare each fail point.
We only need one init task in total: freeze and iterate the registry.
- remove MONGO_FAIL_POINT_DECLARE macro (extern)
- remove MONGO_FAIL_POINT_SHOULD_FAIL macro (FailPoint::shouldFail)
- remove MONGO_FAIL_POINT_BLOCK_IF (FailPoint::executeIf)
- remove MONGO_FAIL_POINT_BLOCK (FailPoint::execute)
- clean up FailPointRegistry and fail_point_service implementation.
Diffstat (limited to 'src/mongo/db/exec')
-rw-r--r-- | src/mongo/db/exec/update_stage.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/db/exec/update_stage.cpp b/src/mongo/db/exec/update_stage.cpp index 4da1d88b854..a9bddf56266 100644 --- a/src/mongo/db/exec/update_stage.cpp +++ b/src/mongo/db/exec/update_stage.cpp @@ -607,7 +607,7 @@ void UpdateStage::doInsert() { } } - if (MONGO_FAIL_POINT(hangBeforeUpsertPerformsInsert)) { + if (MONGO_unlikely(hangBeforeUpsertPerformsInsert.shouldFail())) { CurOpFailpointHelpers::waitWhileFailPointEnabled( &hangBeforeUpsertPerformsInsert, getOpCtx(), "hangBeforeUpsertPerformsInsert"); } @@ -972,10 +972,9 @@ bool UpdateStage::checkUpdateChangesShardKeyFields(ScopedCollectionMetadata meta getOpCtx()->getTxnNumber() || !getOpCtx()->writesAreReplicated()); if (!metadata->keyBelongsToMe(newShardKey)) { - if (MONGO_FAIL_POINT(hangBeforeThrowWouldChangeOwningShard)) { + if (MONGO_unlikely(hangBeforeThrowWouldChangeOwningShard.shouldFail())) { log() << "Hit hangBeforeThrowWouldChangeOwningShard failpoint"; - MONGO_FAIL_POINT_PAUSE_WHILE_SET_OR_INTERRUPTED(getOpCtx(), - hangBeforeThrowWouldChangeOwningShard); + hangBeforeThrowWouldChangeOwningShard.pauseWhileSet(getOpCtx()); } uasserted(WouldChangeOwningShardInfo(oldObj.value(), newObj, false /* upsert */), |