diff options
| author | Jiawei Yang <jiawei.yang@mongodb.com> | 2023-03-29 18:42:16 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-03-30 18:51:41 +0000 |
| commit | b5f1d6bb8c06742cde53f028fd266eff584a2537 (patch) | |
| tree | ed87f3936e635da175b860359aba30ff15424487 /src/mongo/db/s/collection_sharding_runtime.cpp | |
| parent | 4714df5896ddaa06f3146531d2283a013f903996 (diff) | |
| download | mongo-b5f1d6bb8c06742cde53f028fd266eff584a2537.tar.gz | |
Revert "SERVER-70127 change system operation threads to be killable by default"
This reverts commit 9f2867c9da77e2d64df3852f7d4578f10e6f0817.
Revert "SERVER-75352 OplogBatcher's ReplBatcher thread should be unkillable"
This reverts commit 26266d5b736f90961a328399dea5d299cd407ab2.
Diffstat (limited to 'src/mongo/db/s/collection_sharding_runtime.cpp')
| -rw-r--r-- | src/mongo/db/s/collection_sharding_runtime.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mongo/db/s/collection_sharding_runtime.cpp b/src/mongo/db/s/collection_sharding_runtime.cpp index 252bd520884..11493489e73 100644 --- a/src/mongo/db/s/collection_sharding_runtime.cpp +++ b/src/mongo/db/s/collection_sharding_runtime.cpp @@ -699,6 +699,10 @@ void CollectionShardingRuntime::_cleanupBeforeInstallingNewCollectionMetadata( ExecutorFuture<void>{Grid::get(opCtx)->getExecutorPool()->getFixedExecutor()} .then([svcCtx{opCtx->getServiceContext()}, oldUUID, oldShardVersion] { ThreadClient tc{"CleanUpShardedMetadata", svcCtx}; + { + stdx::lock_guard<Client> lk{*tc.get()}; + tc->setSystemOperationKillableByStepdown(lk); + } auto uniqueOpCtx{tc->makeOperationContext()}; auto opCtx{uniqueOpCtx.get()}; |