summaryrefslogtreecommitdiff
path: root/src/mongo/s/client/shard_remote.cpp
diff options
context:
space:
mode:
authorDianna Hohensee <dianna.hohensee@10gen.com>2017-02-01 14:18:12 -0500
committerDianna Hohensee <dianna.hohensee@10gen.com>2017-02-10 15:17:10 -0500
commit489cd07d2a3711286debae56f28416d7ba290648 (patch)
tree4a8dd44484c35b33dc71348635f9a2c7c97b35e8 /src/mongo/s/client/shard_remote.cpp
parent50e9769099bb49220783f95c9045dd1259a18eb4 (diff)
downloadmongo-489cd07d2a3711286debae56f28416d7ba290648.tar.gz
SERVER-27860 remove invariants to prevent ShardLocal running on shards and remove "-OnConfig" function name suffixesr3.5.3
Diffstat (limited to 'src/mongo/s/client/shard_remote.cpp')
-rw-r--r--src/mongo/s/client/shard_remote.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/s/client/shard_remote.cpp b/src/mongo/s/client/shard_remote.cpp
index 85e0bc7678b..1351035133e 100644
--- a/src/mongo/s/client/shard_remote.cpp
+++ b/src/mongo/s/client/shard_remote.cpp
@@ -240,7 +240,7 @@ Shard::HostWithResponse ShardRemote::_runCommand(OperationContext* txn,
std::move(writeConcernStatus)));
}
-StatusWith<Shard::QueryResponse> ShardRemote::_exhaustiveFindOnConfig(
+StatusWith<Shard::QueryResponse> ShardRemote::_exhaustiveFind(
OperationContext* txn,
const ReadPreferenceSetting& readPref,
const repl::ReadConcernLevel& readConcernLevel,
@@ -316,7 +316,7 @@ StatusWith<Shard::QueryResponse> ShardRemote::_exhaustiveFindOnConfig(
}
const Milliseconds maxTimeMS =
- std::min(txn->getRemainingMaxTimeMillis(), kDefaultConfigCommandTimeout);
+ std::min(txn->getRemainingMaxTimeMillis(), kDefaultCommandTimeout);
BSONObjBuilder findCmdBuilder;
@@ -360,10 +360,10 @@ StatusWith<Shard::QueryResponse> ShardRemote::_exhaustiveFindOnConfig(
return response;
}
-Status ShardRemote::createIndexOnConfig(OperationContext* txn,
- const NamespaceString& ns,
- const BSONObj& keys,
- bool unique) {
+Status ShardRemote::createIndex(OperationContext* txn,
+ const NamespaceString& ns,
+ const BSONObj& keys,
+ bool unique) {
MONGO_UNREACHABLE;
}