summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/move_primary_source_manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/s/move_primary_source_manager.cpp')
-rw-r--r--src/mongo/db/s/move_primary_source_manager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/s/move_primary_source_manager.cpp b/src/mongo/db/s/move_primary_source_manager.cpp
index c8c1cc00c90..4ce743ce0d6 100644
--- a/src/mongo/db/s/move_primary_source_manager.cpp
+++ b/src/mongo/db/s/move_primary_source_manager.cpp
@@ -73,7 +73,7 @@ NamespaceString MovePrimarySourceManager::getNss() const {
Status MovePrimarySourceManager::clone(OperationContext* opCtx) {
invariant(!opCtx->lockState()->isLocked());
invariant(_state == kCreated);
- auto scopedGuard = MakeGuard([&] { cleanupOnError(opCtx); });
+ auto scopedGuard = makeGuard([&] { cleanupOnError(opCtx); });
log() << "Moving " << _dbname << " primary from: " << _fromShard << " to: " << _toShard;
@@ -122,14 +122,14 @@ Status MovePrimarySourceManager::clone(OperationContext* opCtx) {
}
_state = kCloneCaughtUp;
- scopedGuard.Dismiss();
+ scopedGuard.dismiss();
return Status::OK();
}
Status MovePrimarySourceManager::enterCriticalSection(OperationContext* opCtx) {
invariant(!opCtx->lockState()->isLocked());
invariant(_state == kCloneCaughtUp);
- auto scopedGuard = MakeGuard([&] { cleanupOnError(opCtx); });
+ auto scopedGuard = makeGuard([&] { cleanupOnError(opCtx); });
// Mark the shard as running a critical operation that requires recovery on crash.
uassertStatusOK(ShardingStateRecovery::startMetadataOp(opCtx));
@@ -173,14 +173,14 @@ Status MovePrimarySourceManager::enterCriticalSection(OperationContext* opCtx) {
log() << "movePrimary successfully entered critical section";
- scopedGuard.Dismiss();
+ scopedGuard.dismiss();
return Status::OK();
}
Status MovePrimarySourceManager::commitOnConfig(OperationContext* opCtx) {
invariant(!opCtx->lockState()->isLocked());
invariant(_state == kCriticalSection);
- auto scopedGuard = MakeGuard([&] { cleanupOnError(opCtx); });
+ auto scopedGuard = makeGuard([&] { cleanupOnError(opCtx); });
ConfigsvrCommitMovePrimary commitMovePrimaryRequest;
commitMovePrimaryRequest.set_configsvrCommitMovePrimary(getNss().ns());
@@ -290,7 +290,7 @@ Status MovePrimarySourceManager::commitOnConfig(OperationContext* opCtx) {
_buildMoveLogEntry(_dbname.toString(), _fromShard.toString(), _toShard.toString()),
ShardingCatalogClient::kMajorityWriteConcern));
- scopedGuard.Dismiss();
+ scopedGuard.dismiss();
_state = kNeedCleanStaleData;