diff options
author | Blake Oler <blake.oler@mongodb.com> | 2018-04-24 17:18:23 -0400 |
---|---|---|
committer | Blake Oler <blake.oler@mongodb.com> | 2018-04-26 15:27:56 -0400 |
commit | 96f2a1a8389774a495b7ea3d4ef8f8ec48af5b50 (patch) | |
tree | 2dde7b79230d43d9a38b85e22d6702a80a1d6eec /src/mongo | |
parent | fb9e6ec91f45036266e9678e4806ca5cbb318164 (diff) | |
download | mongo-96f2a1a8389774a495b7ea3d4ef8f8ec48af5b50.tar.gz |
SERVER-34658 Don't throw an exception inside a ScopeGuard in the MovePrimarySourceManager
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/db/s/move_primary_source_manager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/db/s/move_primary_source_manager.cpp b/src/mongo/db/s/move_primary_source_manager.cpp index be9b71863b2..6af77e7b492 100644 --- a/src/mongo/db/s/move_primary_source_manager.cpp +++ b/src/mongo/db/s/move_primary_source_manager.cpp @@ -324,14 +324,14 @@ void MovePrimarySourceManager::cleanupOnError(OperationContext* opCtx) { return; } - uassertStatusOK(Grid::get(opCtx)->catalogClient()->logChange( - opCtx, - "movePrimary.error", - _dbname.toString(), - _buildMoveLogEntry(_dbname.toString(), _fromShard.toString(), _toShard.toString()), - ShardingCatalogClient::kMajorityWriteConcern)); - try { + uassertStatusOK(Grid::get(opCtx)->catalogClient()->logChange( + opCtx, + "movePrimary.error", + _dbname.toString(), + _buildMoveLogEntry(_dbname.toString(), _fromShard.toString(), _toShard.toString()), + ShardingCatalogClient::kMajorityWriteConcern)); + _cleanup(opCtx); } catch (const ExceptionForCat<ErrorCategory::NotMasterError>& ex) { BSONObjBuilder requestArgsBSON; |