summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/tenant_migration_util.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/repl/tenant_migration_util.cpp')
-rw-r--r--src/mongo/db/repl/tenant_migration_util.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/mongo/db/repl/tenant_migration_util.cpp b/src/mongo/db/repl/tenant_migration_util.cpp
index 66c39f1a897..f92baa8b1e7 100644
--- a/src/mongo/db/repl/tenant_migration_util.cpp
+++ b/src/mongo/db/repl/tenant_migration_util.cpp
@@ -58,7 +58,7 @@ ExternalKeysCollectionDocument makeExternalClusterTimeKeyDoc(ServiceContext* ser
return externalKeyDoc;
}
-ExecutorFuture<void> storeExternalClusterTimeKeyDocsAndRefreshCache(
+void storeExternalClusterTimeKeyDocsAndRefreshCache(
std::shared_ptr<executor::ScopedTaskExecutor> executor,
std::vector<ExternalKeysCollectionDocument> keyDocs,
const CancelationToken& token) {
@@ -88,23 +88,13 @@ ExecutorFuture<void> storeExternalClusterTimeKeyDocsAndRefreshCache(
});
}
- const auto opTime = repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp();
-
- return WaitForMajorityService::get(opCtx->getServiceContext())
- .waitUntilMajority(opTime)
- .thenRunOn(**executor)
- .then([] {
- auto opCtxHolder = cc().makeOperationContext();
- auto opCtx = opCtxHolder.get();
-
- auto validator = LogicalTimeValidator::get(opCtx);
- if (validator) {
- // Refresh the keys cache to avoid validation errors for external cluster times with
- // a keyId that matches the keyId of an internal key since the LogicalTimeValidator
- // only refreshes the cache when it cannot find a matching internal key.
- validator->refreshKeyManagerCache(opCtx);
- }
- });
+ auto validator = LogicalTimeValidator::get(opCtx);
+ if (validator) {
+ // Refresh the keys cache to avoid validation errors for external cluster times with
+ // a keyId that matches the keyId of an internal key since the LogicalTimeValidator
+ // only refreshes the cache when it cannot find a matching internal key.
+ validator->refreshKeyManagerCache(opCtx);
+ }
}
void createRetryableWritesView(OperationContext* opCtx, Database* db) {