diff options
| author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2017-02-01 14:18:12 -0500 |
|---|---|---|
| committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2017-02-10 15:17:10 -0500 |
| commit | 489cd07d2a3711286debae56f28416d7ba290648 (patch) | |
| tree | 4a8dd44484c35b33dc71348635f9a2c7c97b35e8 /src/mongo/s/config_server_test_fixture.cpp | |
| parent | 50e9769099bb49220783f95c9045dd1259a18eb4 (diff) | |
| download | mongo-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/config_server_test_fixture.cpp')
| -rw-r--r-- | src/mongo/s/config_server_test_fixture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/s/config_server_test_fixture.cpp b/src/mongo/s/config_server_test_fixture.cpp index 85a2b6411be..fc6a813ec5c 100644 --- a/src/mongo/s/config_server_test_fixture.cpp +++ b/src/mongo/s/config_server_test_fixture.cpp @@ -192,7 +192,7 @@ Status ConfigServerTestFixture::insertToConfigCollection(OperationContext* txn, kReadPref, ns.db().toString(), request.toBSON(), - Shard::kDefaultConfigCommandTimeout, + Shard::kDefaultCommandTimeout, Shard::RetryPolicy::kNoRetry); BatchedCommandResponse batchResponse; @@ -206,7 +206,7 @@ StatusWith<BSONObj> ConfigServerTestFixture::findOneOnConfigCollection(Operation auto config = getConfigShard(); invariant(config); - auto findStatus = config->exhaustiveFindOnConfig( + auto findStatus = config->exhaustiveFind( txn, kReadPref, repl::ReadConcernLevel::kMajorityReadConcern, ns, filter, BSONObj(), 1); if (!findStatus.isOK()) { return findStatus.getStatus(); @@ -278,7 +278,7 @@ StatusWith<std::vector<BSONObj>> ConfigServerTestFixture::getIndexes(OperationCo ReadPreferenceSetting{ReadPreference::PrimaryOnly}, ns.db().toString(), BSON("listIndexes" << ns.coll().toString()), - Shard::kDefaultConfigCommandTimeout, + Shard::kDefaultCommandTimeout, Shard::RetryPolicy::kIdempotent); if (!response.isOK()) { return response.getStatus(); |