Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 1 insertions, 40 deletions

diff --git a/src/mongo/db/repl/tenant_migration_util.cpp b/src/mongo/db/repl/tenant_migration_util.cpp
index 4386cdf1cce..48e21715a4c 100644
--- a/src/mongo/db/repl/tenant_migration_util.cpp
+++ b/src/mongo/db/repl/tenant_migration_util.cpp
@@ -32,7 +32,7 @@
 #include "mongo/bson/json.h"
 #include "mongo/bson/mutable/algorithm.h"
 #include "mongo/bson/mutable/document.h"
-#include "mongo/db/concurrency/write_conflict_exception.h"
+#include "mongo/db/concurrency/exception_util.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/dbhelpers.h"
@@ -62,50 +62,11 @@ const std::set<std::string> kSensitiveFieldNames{"donorCertificateForRecipient",
                                                  "recipientCertificateForDonor"};
 
 MONGO_FAIL_POINT_DEFINE(pauseTenantMigrationBeforeMarkingExternalKeysGarbageCollectable);
-MONGO_FAIL_POINT_DEFINE(pauseTenantMigrationBeforeStoringExternalClusterTimeKeyDocs);
 
 }  // namespace
 
 const Backoff kExponentialBackoff(Seconds(1), Milliseconds::max());
 
-ExternalKeysCollectionDocument makeExternalClusterTimeKeyDoc(UUID migrationId, BSONObj keyDoc) {
-    auto originalKeyDoc = KeysCollectionDocument::parse(IDLParserErrorContext("keyDoc"), keyDoc);
-
-    ExternalKeysCollectionDocument externalKeyDoc(
-        OID::gen(), originalKeyDoc.getKeyId(), migrationId);
-    externalKeyDoc.setKeysCollectionDocumentBase(originalKeyDoc.getKeysCollectionDocumentBase());
-
-    return externalKeyDoc;
-}
-
-repl::OpTime storeExternalClusterTimeKeyDocs(std::vector<ExternalKeysCollectionDocument> keyDocs) {
-    auto opCtxHolder = cc().makeOperationContext();
-    auto opCtx = opCtxHolder.get();
-    auto nss = NamespaceString::kExternalKeysCollectionNamespace;
-
-    pauseTenantMigrationBeforeStoringExternalClusterTimeKeyDocs.pauseWhileSet(opCtx);
-
-    for (auto& keyDoc : keyDocs) {
-        AutoGetCollection collection(opCtx, nss, MODE_IX);
-
-        writeConflictRetry(opCtx, "CloneExternalKeyDocs", nss.ns(), [&] {
-            // Note that each external key's _id is generated by the migration, so this upsert can
-            // only insert.
-            const auto filter =
-                BSON(ExternalKeysCollectionDocument::kIdFieldName << keyDoc.getId());
-            const auto updateMod = keyDoc.toBSON();
-
-            Helpers::upsert(opCtx,
-                            nss.ns(),
-                            filter,
-                            updateMod,
-                            /*fromMigrate=*/false);
-        });
-    }
-
-    return repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp();
-}
-
 void createOplogViewForTenantMigrations(OperationContext* opCtx, Database* db) {
     writeConflictRetry(
         opCtx, "createDonorOplogView", NamespaceString::kTenantMigrationOplogView.ns(), [&] {