summaryrefslogtreecommitdiff
path: root/src/mongo/s/commands/commands_public.cpp
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2018-01-31 14:17:57 -0500
committerBilly Donahue <billy.donahue@mongodb.com>2018-01-31 14:42:00 -0500
commit40e43aca44d4dd251b7a1d0ce44c7cb49dcda93f (patch)
tree64d9c1fdd03afa929238bd6818fcb901daa40e2f /src/mongo/s/commands/commands_public.cpp
parentd75cb425fbc3cf4b569eb1722c3f8abec45654a2 (diff)
downloadmongo-40e43aca44d4dd251b7a1d0ce44c7cb49dcda93f.tar.gz
SERVER-32958 unrevert "SERVER-32958 slaveOk,slaveOverrideOk replacement"
w/fix: update a new command to secondaryAllowed This reverts commit d75cb425fbc3cf4b569eb1722c3f8abec45654a2.
Diffstat (limited to 'src/mongo/s/commands/commands_public.cpp')
-rw-r--r--src/mongo/s/commands/commands_public.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/s/commands/commands_public.cpp b/src/mongo/s/commands/commands_public.cpp
index 4c153831450..c5e0ecb358d 100644
--- a/src/mongo/s/commands/commands_public.cpp
+++ b/src/mongo/s/commands/commands_public.cpp
@@ -151,8 +151,8 @@ class PublicGridCommand : public BasicCommand {
protected:
PublicGridCommand(const char* n, const char* oldname = NULL) : BasicCommand(n, oldname) {}
- virtual bool slaveOk() const {
- return true;
+ AllowedOnSecondary secondaryAllowed() const override {
+ return AllowedOnSecondary::kAlways;
}
virtual bool adminOnly() const {
@@ -247,8 +247,8 @@ class DropIndexesCmd : public ErrmsgCommandDeprecated {
public:
DropIndexesCmd() : ErrmsgCommandDeprecated("dropIndexes", "deleteIndexes") {}
- bool slaveOk() const override {
- return false;
+ AllowedOnSecondary secondaryAllowed() const override {
+ return AllowedOnSecondary::kNever;
}
bool adminOnly() const override {
@@ -291,8 +291,8 @@ class CreateIndexesCmd : public ErrmsgCommandDeprecated {
public:
CreateIndexesCmd() : ErrmsgCommandDeprecated("createIndexes") {}
- bool slaveOk() const override {
- return false;
+ AllowedOnSecondary secondaryAllowed() const override {
+ return AllowedOnSecondary::kNever;
}
bool adminOnly() const override {
@@ -340,8 +340,8 @@ class ReIndexCmd : public ErrmsgCommandDeprecated {
public:
ReIndexCmd() : ErrmsgCommandDeprecated("reIndex") {}
- bool slaveOk() const override {
- return false;
+ AllowedOnSecondary secondaryAllowed() const override {
+ return AllowedOnSecondary::kNever;
}
bool adminOnly() const override {
@@ -384,8 +384,8 @@ class CollectionModCmd : public ErrmsgCommandDeprecated {
public:
CollectionModCmd() : ErrmsgCommandDeprecated("collMod") {}
- bool slaveOk() const override {
- return false;
+ AllowedOnSecondary secondaryAllowed() const override {
+ return AllowedOnSecondary::kNever;
}
bool adminOnly() const override {