diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-09-23 13:43:50 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-09-23 15:13:17 -0400 |
| commit | 1955b0542e68b31b1e93f99980316817bd1e4416 (patch) | |
| tree | a34040218a2eee3cb7f76dd048d79e5ab44d84b4 /src/mongo/db/s/migration_source_manager.cpp | |
| parent | 51a105220e2c8c282fdd720aed3a3332dd2180fb (diff) | |
| download | mongo-1955b0542e68b31b1e93f99980316817bd1e4416.tar.gz | |
SERVER-23944 Expect CallbackCanceled as shutdown error during chunk commit
Diffstat (limited to 'src/mongo/db/s/migration_source_manager.cpp')
| -rw-r--r-- | src/mongo/db/s/migration_source_manager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index 356728a7c0a..fb36ae89364 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -389,7 +389,8 @@ Status MigrationSourceManager::commitDonateChunk(OperationContext* txn) { << _args.getToShardId()), ShardingCatalogClient::kMajorityWriteConcern); if ((ErrorCodes::isInterruption(status.code()) || - ErrorCodes::isShutdownError(status.code())) && + ErrorCodes::isShutdownError(status.code()) || + status == ErrorCodes::CallbackCanceled) && inShutdown()) { // Since the server is already doing a clean shutdown, this call will just join the // previous shutdown call |