SERVER-61729 Rename TenantSplit to ShardSplit

5 files changed, 21 insertions, 35 deletions

diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js
index 58eb939249c..916b9db27ba 100644
--- a/jstests/core/views/views_all_commands.js
+++ b/jstests/core/views/views_all_commands.js
@@ -282,9 +282,8 @@ let viewsCommandTests = {
     donorForgetMigration: {skip: isUnrelated},
     donorStartMigration: {skip: isUnrelated},
     donorWaitForMigrationToCommit: {skip: isUnrelated},
-    donorAbortSplit: {skip: isUnrelated},
-    donorForgetSplit: {skip: isUnrelated},
-    donorStartSplit: {skip: isUnrelated},
+    abortShardSplit: {skip: isUnrelated},
+    commitShardSplit: {skip: isUnrelated},
     driverOIDTest: {skip: isUnrelated},
     drop: {command: {drop: "view"}},
     dropAllRolesFromDatabase: {skip: isUnrelated},
diff --git a/jstests/replsets/db_reads_while_recovering_all_commands.js b/jstests/replsets/db_reads_while_recovering_all_commands.js
index cc3df9adf90..2701e5fc516 100644
--- a/jstests/replsets/db_reads_while_recovering_all_commands.js
+++ b/jstests/replsets/db_reads_while_recovering_all_commands.js
@@ -162,9 +162,8 @@ const allCommands = {
     donorForgetMigration: {skip: isPrimaryOnly},
     donorStartMigration: {skip: isPrimaryOnly},
     donorWaitForMigrationToCommit: {skip: isPrimaryOnly},
-    donorAbortSplit: {skip: isPrimaryOnly},
-    donorForgetSplit: {skip: isPrimaryOnly},
-    donorStartSplit: {skip: isPrimaryOnly},
+    abortShardSplit: {skip: isPrimaryOnly},
+    commitShardSplit: {skip: isPrimaryOnly},
     driverOIDTest: {skip: isNotAUserDataRead},
     drop: {skip: isPrimaryOnly},
     dropAllRolesFromDatabase: {skip: isPrimaryOnly},
diff --git a/jstests/replsets/tenant_split_abort.js b/jstests/replsets/shard_split_abort.js
index c9e966400b0..8092da24425 100644
--- a/jstests/replsets/tenant_split_abort.js
+++ b/jstests/replsets/shard_split_abort.js
@@ -1,5 +1,5 @@
 /*
- * Test invocation of donorAbortSplit command
+ * Test invocation of commitShardSplit command
  * @tags: [requires_fcv_52, featureFlagShardSplit]
  */
 
@@ -43,8 +43,8 @@ function runSuccess() {
     jsTestLog("Asserting no state document exist before command");
     assert.isnull(findMigration(primary, migrationId));
 
-    jsTestLog("Running donorAbortSplit command");
-    assert.commandWorked(adminDb.runCommand({donorAbortSplit: 1, migrationId: migrationId}));
+    jsTestLog("Running abortShardSplit command");
+    assert.commandWorked(adminDb.runCommand({abortShardSplit: 1, migrationId: migrationId}));
 
     jsTestLog("Asserting state document exist after command");
     assertDocumentState(primary, migrationId, "aborted");
diff --git a/jstests/replsets/shard_split_enabled.js b/jstests/replsets/shard_split_enabled.js
index 7b898f88d67..db22570a8e2 100644
--- a/jstests/replsets/shard_split_enabled.js
+++ b/jstests/replsets/shard_split_enabled.js
@@ -12,19 +12,16 @@ load("jstests/replsets/libs/tenant_migration_util.js");
 const kDummyConnStr = "mongodb://localhost/?replicaSet=foo";
 function makeShardSplitTest() {
     return function(downgradeFCV) {
-        function donorStartSplitCmd() {
+        function commitShardSplitCmd() {
             return {
-                donorStartSplit: 1,
+                commitShardSplit: 1,
                 tenantId: "foo",
                 migrationId: UUID(),
                 recipientConnectionString: kDummyConnStr
             };
         }
-        function donorForgetSplitCmd() {
-            return {donorForgetSplit: 1, migrationId: UUID()};
-        }
-        function donorAbortSplitCmd() {
-            return {donorAbortSplit: 1, migrationId: UUID()};
+        function abortShardSplitCmd() {
+            return {abortShardSplit: 1, migrationId: UUID()};
         }
 
         // start up a replica set
@@ -39,33 +36,25 @@ function makeShardSplitTest() {
         assert.eq(getFCVConstants().latest,
                   adminDB.system.version.findOne({_id: 'featureCompatibilityVersion'}).version);
 
-        let res = adminDB.runCommand(donorStartSplitCmd());
+        let res = adminDB.runCommand(commitShardSplitCmd());
         assert.neq(res.code,
                    6057900,
-                   `donorStartSplitCmd shouldn't reject when featureFlagShardSplit is enabled`);
-        res = adminDB.runCommand(donorForgetSplitCmd());
-        assert.neq(res.code,
-                   6057901,
-                   `donorForgetSplitCmd shouldn't reject when featureFlagShardSplit is enabled`);
-        res = adminDB.runCommand(donorAbortSplitCmd());
+                   `commitShardSplitCmd shouldn't reject when featureFlagShardSplit is enabled`);
+        res = adminDB.runCommand(abortShardSplitCmd());
         assert.neq(res.code,
                    6057902,
-                   `donorAbortSplitCmd shouldn't reject when featureFlagShardSplit is enabled`);
+                   `abortShardSplitCmd shouldn't reject when featureFlagShardSplit is enabled`);
 
         assert.commandWorked(adminDB.adminCommand({setFeatureCompatibilityVersion: downgradeFCV}));
 
         assert.commandFailedWithCode(
-            adminDB.runCommand(donorStartSplitCmd()),
+            adminDB.runCommand(commitShardSplitCmd()),
             6057900,
-            `donorStartSplitCmd should reject when featureFlagShardSplit is disabled`);
-        assert.commandFailedWithCode(
-            adminDB.runCommand(donorForgetSplitCmd()),
-            6057901,
-            `donorForgetSplitCmd should reject when featureFlagShardSplit is disabled`);
+            `commitShardSplitCmd should reject when featureFlagShardSplit is disabled`);
         assert.commandFailedWithCode(
-            adminDB.runCommand(donorAbortSplitCmd()),
+            adminDB.runCommand(abortShardSplitCmd()),
             6057902,
-            `donorAbortSplitCmd should reject when featureFlagShardSplit is disabled`);
+            `abortShardSplitCmd should reject when featureFlagShardSplit is disabled`);
 
         // shut down replica set
         rst.stopSet();
diff --git a/jstests/sharding/read_write_concern_defaults_application.js b/jstests/sharding/read_write_concern_defaults_application.js
index 64ab7ac398f..05261fe6ac9 100644
--- a/jstests/sharding/read_write_concern_defaults_application.js
+++ b/jstests/sharding/read_write_concern_defaults_application.js
@@ -343,9 +343,8 @@ let testCases = {
     donorForgetMigration: {skip: "does not accept read or write concern"},
     donorStartMigration: {skip: "does not accept read or write concern"},
     donorWaitForMigrationToCommit: {skip: "does not accept read or write concern"},
-    donorAbortSplit: {skip: "does not accept read or write concern"},
-    donorForgetSplit: {skip: "does not accept read or write concern"},
-    donorStartSplit: {skip: "does not accept read or write concern"},
+    abortShardSplit: {skip: "does not accept read or write concern"},
+    commitShardSplit: {skip: "does not accept read or write concern"},
     driverOIDTest: {skip: "internal command"},
     drop: {
         setUp: function(conn) {