diff options
| author | Ian Kuehne <ian.kuehne@mongodb.com> | 2017-07-03 13:10:24 -0400 |
|---|---|---|
| committer | Ian Kuehne <ian.kuehne@mongodb.com> | 2017-07-03 15:58:06 -0400 |
| commit | acd196d77043d007b07b48b6e2c4fb13cfa5b938 (patch) | |
| tree | ffd83f977e02211f7867bed6dc67d4efed71b0fe /src/mongo/db/exec | |
| parent | d362678ea9a9e4e948bfda0bc60e2fefdd1eb045 (diff) | |
| download | mongo-acd196d77043d007b07b48b6e2c4fb13cfa5b938.tar.gz | |
SERVER-29544 Remove deprecated macro calls.
Diffstat (limited to 'src/mongo/db/exec')
| -rw-r--r-- | src/mongo/db/exec/update.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/exec/update.cpp b/src/mongo/db/exec/update.cpp index c3dae9389fb..879a5c7db05 100644 --- a/src/mongo/db/exec/update.cpp +++ b/src/mongo/db/exec/update.cpp @@ -476,7 +476,8 @@ void UpdateStage::doInsert() { if (request->isExplain()) { return; } - MONGO_WRITE_CONFLICT_RETRY_LOOP_BEGIN { + + writeConflictRetry(getOpCtx(), "upsert", _collection->ns().ns(), [&] { WriteUnitOfWork wunit(getOpCtx()); invariant(_collection); const bool enforceQuota = !request->isGod(); @@ -486,8 +487,7 @@ void UpdateStage::doInsert() { // Technically, we should save/restore state here, but since we are going to return // immediately after, it would just be wasted work. wunit.commit(); - } - MONGO_WRITE_CONFLICT_RETRY_LOOP_END(getOpCtx(), "upsert", _collection->ns().ns()); + }); } bool UpdateStage::doneUpdating() { |