SERVER-58893 Rename flag to skipApiVersionCheck

10 files changed, 21 insertions, 11 deletions

diff --git a/src/mongo/db/commands.h b/src/mongo/db/commands.h
index 07c08e5000d..146ca75dca7 100644
--- a/src/mongo/db/commands.h
+++ b/src/mongo/db/commands.h
@@ -417,8 +417,9 @@ public:
 
     /*
      * Some commands permit any values for apiVersion, apiStrict, and apiDeprecationErrors.
+     * For internal (server to server) commands we should skip checking api version.
      */
-    virtual bool acceptsAnyApiVersionParameters() const {
+    virtual bool skipApiVersionCheck() const {
         return false;
     }
 
diff --git a/src/mongo/db/initialize_api_parameters.cpp b/src/mongo/db/initialize_api_parameters.cpp
index dc55104d1fb..7700500b8fa 100644
--- a/src/mongo/db/initialize_api_parameters.cpp
+++ b/src/mongo/db/initialize_api_parameters.cpp
@@ -46,7 +46,7 @@ const APIParametersFromClient initializeAPIParameters(const BSONObj& requestBody
     auto apiParamsFromClient =
         APIParametersFromClient::parse("APIParametersFromClient"_sd, requestBody);
 
-    if (command->acceptsAnyApiVersionParameters()) {
+    if (command->skipApiVersionCheck()) {
         return apiParamsFromClient;
     }
 
diff --git a/src/mongo/db/s/config/configsvr_create_database_command.cpp b/src/mongo/db/s/config/configsvr_create_database_command.cpp
index 16a89fa4014..c3d332d3f4d 100644
--- a/src/mongo/db/s/config/configsvr_create_database_command.cpp
+++ b/src/mongo/db/s/config/configsvr_create_database_command.cpp
@@ -55,7 +55,8 @@ public:
      * We accept any apiVersion, apiStrict, and/or apiDeprecationErrors forwarded with this internal
      * command.
      */
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/flush_database_cache_updates_command.cpp b/src/mongo/db/s/flush_database_cache_updates_command.cpp
index cf4a033f668..1f5a5be294a 100644
--- a/src/mongo/db/s/flush_database_cache_updates_command.cpp
+++ b/src/mongo/db/s/flush_database_cache_updates_command.cpp
@@ -71,7 +71,8 @@ public:
      * We accept any apiVersion, apiStrict, and/or apiDeprecationErrors forwarded with this internal
      * command.
      */
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/shardsvr_drop_collection_command.cpp b/src/mongo/db/s/shardsvr_drop_collection_command.cpp
index dd0c414b884..fc153e1de67 100644
--- a/src/mongo/db/s/shardsvr_drop_collection_command.cpp
+++ b/src/mongo/db/s/shardsvr_drop_collection_command.cpp
@@ -51,7 +51,8 @@ public:
                "directly. Drops a collection.";
     }
 
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/shardsvr_drop_collection_participant_command.cpp b/src/mongo/db/s/shardsvr_drop_collection_participant_command.cpp
index 7698a1495d3..d480b858507 100644
--- a/src/mongo/db/s/shardsvr_drop_collection_participant_command.cpp
+++ b/src/mongo/db/s/shardsvr_drop_collection_participant_command.cpp
@@ -46,7 +46,8 @@ namespace {
 class ShardsvrDropCollectionParticipantCommand final
     : public TypedCommand<ShardsvrDropCollectionParticipantCommand> {
 public:
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/shardsvr_drop_database_command.cpp b/src/mongo/db/s/shardsvr_drop_database_command.cpp
index 85f070929be..b6051cb8008 100644
--- a/src/mongo/db/s/shardsvr_drop_database_command.cpp
+++ b/src/mongo/db/s/shardsvr_drop_database_command.cpp
@@ -52,7 +52,8 @@ public:
                "directly. Drops a database.";
     }
 
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/shardsvr_drop_database_participant_command.cpp b/src/mongo/db/s/shardsvr_drop_database_participant_command.cpp
index 07ef5bf4669..e6b65c067a8 100644
--- a/src/mongo/db/s/shardsvr_drop_database_participant_command.cpp
+++ b/src/mongo/db/s/shardsvr_drop_database_participant_command.cpp
@@ -46,7 +46,8 @@ namespace {
 class ShardsvrDropDatabaseParticipantCommand final
     : public TypedCommand<ShardsvrDropDatabaseParticipantCommand> {
 public:
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/shardsvr_refine_collection_shard_key_command.cpp b/src/mongo/db/s/shardsvr_refine_collection_shard_key_command.cpp
index e3e4d41d6a3..bab84ffbebe 100644
--- a/src/mongo/db/s/shardsvr_refine_collection_shard_key_command.cpp
+++ b/src/mongo/db/s/shardsvr_refine_collection_shard_key_command.cpp
@@ -41,7 +41,8 @@ namespace {
 class ShardsvrRefineCollectionShardKeyCommand final
     : public TypedCommand<ShardsvrRefineCollectionShardKeyCommand> {
 public:
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
diff --git a/src/mongo/db/s/txn_two_phase_commit_cmds.cpp b/src/mongo/db/s/txn_two_phase_commit_cmds.cpp
index 41d47497a77..b228c301d95 100644
--- a/src/mongo/db/s/txn_two_phase_commit_cmds.cpp
+++ b/src/mongo/db/s/txn_two_phase_commit_cmds.cpp
@@ -51,7 +51,8 @@ MONGO_FAIL_POINT_DEFINE(participantReturnNetworkErrorForPrepareAfterExecutingPre
 
 class PrepareTransactionCmd : public TypedCommand<PrepareTransactionCmd> {
 public:
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }
 
@@ -228,7 +229,8 @@ class CoordinateCommitTransactionCmd : public TypedCommand<CoordinateCommitTrans
 public:
     using Request = CoordinateCommitTransaction;
 
-    bool acceptsAnyApiVersionParameters() const override {
+    bool skipApiVersionCheck() const override {
+        /* Internal command (server to server) */
         return true;
     }