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/system_index.cpp | |
| parent | d362678ea9a9e4e948bfda0bc60e2fefdd1eb045 (diff) | |
| download | mongo-acd196d77043d007b07b48b6e2c4fb13cfa5b938.tar.gz | |
SERVER-29544 Remove deprecated macro calls.
Diffstat (limited to 'src/mongo/db/system_index.cpp')
| -rw-r--r-- | src/mongo/db/system_index.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mongo/db/system_index.cpp b/src/mongo/db/system_index.cpp index a46b1bf45eb..0c07a4e46ad 100644 --- a/src/mongo/db/system_index.cpp +++ b/src/mongo/db/system_index.cpp @@ -118,21 +118,19 @@ void generateSystemIndexForExistingCollection(OperationContext* opCtx, MultiIndexBlock indexer(opCtx, collection); - MONGO_WRITE_CONFLICT_RETRY_LOOP_BEGIN { + writeConflictRetry(opCtx, "authorization index regeneration", ns.ns(), [&] { fassertStatusOK(40453, indexer.init(indexSpec)); - } - MONGO_WRITE_CONFLICT_RETRY_LOOP_END(opCtx, "authorization index regeneration", ns.ns()); + }); fassertStatusOK(40454, indexer.insertAllDocumentsInCollection()); - MONGO_WRITE_CONFLICT_RETRY_LOOP_BEGIN { + writeConflictRetry(opCtx, "authorization index regeneration", ns.ns(), [&] { WriteUnitOfWork wunit(opCtx); indexer.commit(); wunit.commit(); - } - MONGO_WRITE_CONFLICT_RETRY_LOOP_END(opCtx, "authorization index regeneration", ns.ns()); + }); log() << "Authorization index construction on " << ns << " is complete"; } catch (const DBException& e) { |