Revert "SERVER-45610 Reject commands that read data when node is in RECOVERING state"

This reverts commit ea7294598dc4621245739da201c0aeaf11aaf957.

13 files changed, 5 insertions, 66 deletions

diff --git a/src/mongo/db/commands/dbcheck.cpp b/src/mongo/db/commands/dbcheck.cpp
index a446095f91b..42cfdf10cd6 100644
--- a/src/mongo/db/commands/dbcheck.cpp
+++ b/src/mongo/db/commands/dbcheck.cpp
@@ -492,10 +492,6 @@ public:
         return AllowedOnSecondary::kNever;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     virtual bool adminOnly() const {
         return false;
     }
diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp
index a7015ebf7ec..e21d689045a 100644
--- a/src/mongo/db/commands/dbcommands.cpp
+++ b/src/mongo/db/commands/dbcommands.cpp
@@ -562,9 +562,6 @@ public:
     AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
         return AllowedOnSecondary::kAlways;
     }
-    bool maintenanceOk() const override {
-        return false;
-    }
     virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
         return false;
     }
@@ -647,9 +644,6 @@ public:
     AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
         return AllowedOnSecondary::kAlways;
     }
-    bool maintenanceOk() const override {
-        return false;
-    }
     virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
         return false;
     }
diff --git a/src/mongo/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp
index d04cb68ebbc..b4e16653a51 100644
--- a/src/mongo/db/commands/distinct.cpp
+++ b/src/mongo/db/commands/distinct.cpp
@@ -76,10 +76,6 @@ public:
         return AllowedOnSecondary::kOptIn;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     bool supportsWriteConcern(const BSONObj& cmd) const override {
         return false;
     }
diff --git a/src/mongo/db/commands/list_collections.cpp b/src/mongo/db/commands/list_collections.cpp
index 7ef36d2e1cf..d3841cbaed8 100644
--- a/src/mongo/db/commands/list_collections.cpp
+++ b/src/mongo/db/commands/list_collections.cpp
@@ -214,9 +214,6 @@ public:
     AllowedOnSecondary secondaryAllowed(ServiceContext*) const final {
         return AllowedOnSecondary::kOptIn;
     }
-    bool maintenanceOk() const override {
-        return false;
-    }
     bool adminOnly() const final {
         return false;
     }
diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp
index 9a383f85522..19ebc60b933 100644
--- a/src/mongo/db/commands/list_databases.cpp
+++ b/src/mongo/db/commands/list_databases.cpp
@@ -68,9 +68,6 @@ public:
     bool adminOnly() const final {
         return true;
     }
-    bool maintenanceOk() const final {
-        return false;
-    }
     bool supportsWriteConcern(const BSONObj& cmd) const final {
         return false;
     }
diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp
index 02dc4b7ead2..dafefa6f1ee 100644
--- a/src/mongo/db/commands/list_indexes.cpp
+++ b/src/mongo/db/commands/list_indexes.cpp
@@ -96,9 +96,6 @@ public:
         return AllowedOnSecondary::kOptIn;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
     virtual bool adminOnly() const {
         return false;
     }
diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
index d068dc2812a..a70ae8a51d3 100644
--- a/src/mongo/db/commands/pipeline_command.cpp
+++ b/src/mongo/db/commands/pipeline_command.cpp
@@ -168,9 +168,7 @@ public:
     AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
         return AllowedOnSecondary::kOptIn;
     }
-    bool maintenanceOk() const override {
-        return false;
-    }
+
     ReadWriteType getReadWriteType() const {
         return ReadWriteType::kRead;
     }
diff --git a/src/mongo/s/commands/cluster_coll_stats_cmd.cpp b/src/mongo/s/commands/cluster_coll_stats_cmd.cpp
index b6b78d452df..c1c9a24d5f8 100644
--- a/src/mongo/s/commands/cluster_coll_stats_cmd.cpp
+++ b/src/mongo/s/commands/cluster_coll_stats_cmd.cpp
@@ -53,10 +53,6 @@ public:
         return false;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override {
         return CommandHelpers::parseNsCollectionRequired(dbname, cmdObj).ns();
     }
diff --git a/src/mongo/s/commands/cluster_db_stats_cmd.cpp b/src/mongo/s/commands/cluster_db_stats_cmd.cpp
index b8b9e2f90f9..3408419de95 100644
--- a/src/mongo/s/commands/cluster_db_stats_cmd.cpp
+++ b/src/mongo/s/commands/cluster_db_stats_cmd.cpp
@@ -88,10 +88,6 @@ public:
         return AllowedOnSecondary::kAlways;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     bool adminOnly() const override {
         return false;
     }
diff --git a/src/mongo/s/commands/cluster_distinct_cmd.cpp b/src/mongo/s/commands/cluster_distinct_cmd.cpp
index 1b19ddaad90..bba351c4f58 100644
--- a/src/mongo/s/commands/cluster_distinct_cmd.cpp
+++ b/src/mongo/s/commands/cluster_distinct_cmd.cpp
@@ -64,10 +64,6 @@ public:
         return AllowedOnSecondary::kAlways;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     bool adminOnly() const override {
         return false;
     }
diff --git a/src/mongo/s/commands/cluster_list_databases_cmd.cpp b/src/mongo/s/commands/cluster_list_databases_cmd.cpp
index 4222656f498..fb5e9ab261a 100644
--- a/src/mongo/s/commands/cluster_list_databases_cmd.cpp
+++ b/src/mongo/s/commands/cluster_list_databases_cmd.cpp
@@ -55,10 +55,6 @@ public:
         return AllowedOnSecondary::kAlways;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     bool adminOnly() const override {
         return true;
     }
diff --git a/src/mongo/s/commands/commands_public.cpp b/src/mongo/s/commands/commands_public.cpp
index 16f56cd9d24..bcdeaeb3b02 100644
--- a/src/mongo/s/commands/commands_public.cpp
+++ b/src/mongo/s/commands/commands_public.cpp
@@ -365,10 +365,6 @@ public:
         return AllowedOnSecondary::kAlways;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     bool adminOnly() const override {
         return false;
     }
@@ -521,10 +517,6 @@ public:
         return AllowedOnSecondary::kAlways;
     }
 
-    bool maintenanceOk() const override {
-        return false;
-    }
-
     bool adminOnly() const override {
         return false;
     }
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 928e1d03945..9d4b6ea5a09 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -2193,15 +2193,10 @@ var ReplSetTest = function(opts) {
 
             print("checkDBHashesForReplSet checking data hashes against primary: " + primary.host);
 
-            slaves.forEach(node => {
-                // Arbiters have no replicated data.
-                if (isNodeArbiter(node)) {
-                    print("checkDBHashesForReplSet skipping data of arbiter: " + node.host);
-                    return;
-                }
+            slaves.forEach(secondary => {
                 print("checkDBHashesForReplSet going to check data hashes on secondary: " +
-                      node.host);
-                node.getDBNames().forEach(dbName => combinedDBs.add(dbName));
+                      secondary.host);
+                secondary.getDBNames().forEach(dbName => combinedDBs.add(dbName));
             });
 
             for (var dbName of combinedDBs) {
@@ -2626,14 +2621,7 @@ var ReplSetTest = function(opts) {
         }
 
         function checkCollectionCountsForReplSet(rst) {
-            rst.nodes.forEach(node => {
-                // Arbiters have no replicated collections.
-                if (isNodeArbiter(node)) {
-                    print("checkCollectionCounts skipping counts for arbiter: " + node.host);
-                    return;
-                }
-                checkCollectionCountsForNode(node);
-            });
+            rst.nodes.forEach(node => checkCollectionCountsForNode(node));
             assert(success, `Collection counts did not match. search for '${errPrefix}' in logs.`);
         }