From 1ceca57bcaaa65bdf44064350eb850e9154400dd Mon Sep 17 00:00:00 2001
From: Luis Osta <luis.osta@mongodb.com>
Date: Wed, 15 Jul 2020 14:04:48 +0000
Subject: added basic function for mtab blocking

---
 .../migrating_tenant_mtab_blocks_writes.js         | 17 +++++++++++++
 src/mongo/db/repl/migrating_tenant_donor_util.cpp  | 29 +++++++++++++---------
 src/mongo/db/repl/migrating_tenant_donor_util.h    |  3 ---
 3 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 jstests/replsets/migrating_tenant_mtab_blocks_writes.js

diff --git a/jstests/replsets/migrating_tenant_mtab_blocks_writes.js b/jstests/replsets/migrating_tenant_mtab_blocks_writes.js
new file mode 100644
index 00000000000..a77e7f8328d
--- /dev/null
+++ b/jstests/replsets/migrating_tenant_mtab_blocks_writes.js
@@ -0,0 +1,17 @@
+/**
+ *
+ * @tags: [requires_fcv_46]
+ */
+
+(function () {
+    "use strict";
+
+
+    const rst = new ReplSetTest({ nodes: 1 });
+    rst.startSet();
+    rst.initiate();
+
+    assert(true)
+
+    rst.stopSet();
+})();
\ No newline at end of file
diff --git a/src/mongo/db/repl/migrating_tenant_donor_util.cpp b/src/mongo/db/repl/migrating_tenant_donor_util.cpp
index 6925c391f5f..826551972a6 100644
--- a/src/mongo/db/repl/migrating_tenant_donor_util.cpp
+++ b/src/mongo/db/repl/migrating_tenant_donor_util.cpp
@@ -83,6 +83,23 @@ void onTransitionToBlocking(OperationContext* opCtx, TenantMigrationDonorDocumen
     mtab->startBlockingReadsAfter(donorDoc.getBlockTimestamp().get());
 }
 
+/**
+ * Creates a MigratingTenantAccess blocker and then adds it to the MtabByPrefix container through
+ * the donor document's databasePrefix.
+ */
+void startTenantMigrationBlockOnPrimary(OperationContext* opCtx,
+                                        const TenantMigrationDonorDocument& donorDoc) {
+    invariant(donorDoc.getState() == TenantMigrationDonorStateEnum::kDataSync);
+    auto serviceContext = opCtx->getServiceContext();
+
+    executor::TaskExecutor* mtabExecutor = getTenantMigrationExecutor(serviceContext).get();
+    auto mtab = std::make_shared<MigratingTenantAccessBlocker>(serviceContext, mtabExecutor);
+
+    mtab->startBlockingWrites();
+
+    auto& mtabByPrefix = MigratingTenantAccessBlockerByPrefix::get(serviceContext);
+    mtabByPrefix.add(donorDoc.getDatabasePrefix(), mtab);
+}
 }  // namespace
 
 /**
@@ -146,19 +163,7 @@ void dataSync(OperationContext* opCtx, const TenantMigrationDonorDocument& origi
         }));
 }
 
-void startTenantMigrationBlockOnPrimary(OperationContext* opCtx,
-                                        const TenantMigrationDonorDocument& donorDoc) {
-    invariant(donorDoc.getState() == TenantMigrationDonorStateEnum::kDataSync);
-    auto serviceContext = opCtx->getServiceContext();
 
-    executor::TaskExecutor* mtabExecutor = getTenantMigrationExecutor(serviceContext).get();
-    auto mtab = std::make_shared<MigratingTenantAccessBlocker>(serviceContext, mtabExecutor);
-
-    mtab->startBlockingWrites();
-
-    auto& mtabByPrefix = MigratingTenantAccessBlockerByPrefix::get(serviceContext);
-    mtabByPrefix.add(donorDoc.getDatabasePrefix(), mtab);
-}
 std::shared_ptr<executor::TaskExecutor> getTenantMigrationExecutor(ServiceContext* serviceContext) {
     ThreadPool::Options tpOptions;
     tpOptions.threadNamePrefix = kThreadNamePrefix;
diff --git a/src/mongo/db/repl/migrating_tenant_donor_util.h b/src/mongo/db/repl/migrating_tenant_donor_util.h
index da87e083100..64bfe1474ec 100644
--- a/src/mongo/db/repl/migrating_tenant_donor_util.h
+++ b/src/mongo/db/repl/migrating_tenant_donor_util.h
@@ -53,9 +53,6 @@ std::shared_ptr<executor::TaskExecutor> getTenantMigrationExecutor(ServiceContex
  * config.migrationDonors document.
  */
 void onTenantMigrationDonorStateTransition(OperationContext* opCtx, const BSONObj& doc);
-
-void startTenantMigrationBlockOnPrimary(OperationContext* opCtx, const TenantMigrationDonorDocument& donorDoc);
-
 }  // namespace migrating_tenant_donor_util
 
 }  // namespace mongo
-- 
cgit v1.2.1