summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
authorIan Boros <ian.boros@mongodb.com>2020-02-14 18:37:38 +0000
committerevergreen <evergreen@mongodb.com>2020-02-14 18:37:38 +0000
commit542de84ec1e17520bd0d99d54a024ff0e0bc3de2 (patch)
treee5fe662f80d3a2e59bfc524e07ab98b0cfcda2e7 /src/mongo/db
parent453095e2e5028de3991d0d28692e298957213214 (diff)
downloadmongo-542de84ec1e17520bd0d99d54a024ff0e0bc3de2.tar.gz
Revert "SERVER-45610 Reject commands that read data when node is in RECOVERING state"
This reverts commit ea7294598dc4621245739da201c0aeaf11aaf957.
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/commands/dbcheck.cpp4
-rw-r--r--src/mongo/db/commands/dbcommands.cpp6
-rw-r--r--src/mongo/db/commands/distinct.cpp4
-rw-r--r--src/mongo/db/commands/list_collections.cpp3
-rw-r--r--src/mongo/db/commands/list_databases.cpp3
-rw-r--r--src/mongo/db/commands/list_indexes.cpp3
-rw-r--r--src/mongo/db/commands/pipeline_command.cpp4
7 files changed, 1 insertions, 26 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;
}