diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2021-11-30 19:10:32 +0100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-07 12:47:28 +0000 |
| commit | 7879dd15deaa37f1f3a53a46e9877ef6b03b2f97 (patch) | |
| tree | 1352fa51b77412f93270f04bab756eadb161b63d /src/mongo/db/s/shard_server_op_observer.cpp | |
| parent | d69f240a64dea20ca163a93b6eeb6494ea1e4a24 (diff) | |
| download | mongo-7879dd15deaa37f1f3a53a46e9877ef6b03b2f97.tar.gz | |
SERVER-61759 Interrupt and join migrations when allowMigrations is set to false
Diffstat (limited to 'src/mongo/db/s/shard_server_op_observer.cpp')
| -rw-r--r-- | src/mongo/db/s/shard_server_op_observer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/s/shard_server_op_observer.cpp b/src/mongo/db/s/shard_server_op_observer.cpp index cff62e2d7a1..26365cb46ab 100644 --- a/src/mongo/db/s/shard_server_op_observer.cpp +++ b/src/mongo/db/s/shard_server_op_observer.cpp @@ -209,9 +209,9 @@ void incrementChunkOnInsertOrUpdate(OperationContext* opCtx, void abortOngoingMigrationIfNeeded(OperationContext* opCtx, const NamespaceString nss) { auto* const csr = CollectionShardingRuntime::get(opCtx, nss); auto csrLock = CollectionShardingRuntime::CSRLock::lockShared(opCtx, csr); - auto msm = MigrationSourceManager::get(csr, csrLock); - if (msm) { - msm->abortDueToConflictingIndexOperation(opCtx); + if (auto msm = MigrationSourceManager::get(csr, csrLock)) { + // Only interrupt the migration, but don't actually join + (void)msm->abort(); } } |