summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/replset_commands.cpp
diff options
context:
space:
mode:
authorJudah Schvimer <judah@mongodb.com>2016-05-27 10:11:21 -0400
committerJudah Schvimer <judah@mongodb.com>2016-05-27 10:11:21 -0400
commit9b3fc54ceb6d1066e423f7c562c22de2f5c6480e (patch)
tree26153960ba47738da06b62bde700fabb2061539d /src/mongo/db/repl/replset_commands.cpp
parentd5a2826989b0e5ae268ba9cc4226611d7c83c207 (diff)
downloadmongo-9b3fc54ceb6d1066e423f7c562c22de2f5c6480e.tar.gz
SERVER-23698 Removed ability to run replSetInitiate if not started as a replica set node
Diffstat (limited to 'src/mongo/db/repl/replset_commands.cpp')
-rw-r--r--src/mongo/db/repl/replset_commands.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mongo/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
index e12f0405751..70aaa8b7b6d 100644
--- a/src/mongo/db/repl/replset_commands.cpp
+++ b/src/mongo/db/repl/replset_commands.cpp
@@ -354,15 +354,9 @@ public:
std::string replSetString =
ReplicationCoordinator::get(txn)->getSettings().getReplSetString();
if (replSetString.empty()) {
- if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer) {
- return appendCommandStatus(result,
- ReplicationCoordinator::get(txn)
- ->processReplSetInitiate(txn, configObj, &result));
- }
return appendCommandStatus(result,
Status(ErrorCodes::NoReplicationEnabled,
- "This node was not started with the replSet "
- "option"));
+ "This node was not started with the replSet option"));
}
if (configObj.isEmpty()) {