summaryrefslogtreecommitdiff
path: root/src/mongo/s/catalog/sharding_catalog_merge_chunks_test.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/catalog/sharding_catalog_merge_chunks_test.cpp
parent50e9769099bb49220783f95c9045dd1259a18eb4 (diff)
downloadmongo-r3.5.3.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/catalog/sharding_catalog_merge_chunks_test.cpp')
-rw-r--r--src/mongo/s/catalog/sharding_catalog_merge_chunks_test.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mongo/s/catalog/sharding_catalog_merge_chunks_test.cpp b/src/mongo/s/catalog/sharding_catalog_merge_chunks_test.cpp
index cdb71cfa7cf..52bfa2df31f 100644
--- a/src/mongo/s/catalog/sharding_catalog_merge_chunks_test.cpp
+++ b/src/mongo/s/catalog/sharding_catalog_merge_chunks_test.cpp
@@ -72,13 +72,13 @@ TEST_F(MergeChunkTest, MergeExistingChunksCorrectlyShouldSucceed) {
"shard0000"));
auto findResponse = uassertStatusOK(
- getConfigShard()->exhaustiveFindOnConfig(operationContext(),
- ReadPreferenceSetting{ReadPreference::PrimaryOnly},
- repl::ReadConcernLevel::kLocalReadConcern,
- NamespaceString(ChunkType::ConfigNS),
- BSON(ChunkType::ns() << "TestDB.TestColl"),
- BSON(ChunkType::DEPRECATED_lastmod << -1),
- boost::none));
+ getConfigShard()->exhaustiveFind(operationContext(),
+ ReadPreferenceSetting{ReadPreference::PrimaryOnly},
+ repl::ReadConcernLevel::kLocalReadConcern,
+ NamespaceString(ChunkType::ConfigNS),
+ BSON(ChunkType::ns() << "TestDB.TestColl"),
+ BSON(ChunkType::DEPRECATED_lastmod << -1),
+ boost::none));
const auto& chunksVector = findResponse.docs;
@@ -135,13 +135,13 @@ TEST_F(MergeChunkTest, MergeSeveralChunksCorrectlyShouldSucceed) {
"shard0000"));
auto findResponse = uassertStatusOK(
- getConfigShard()->exhaustiveFindOnConfig(operationContext(),
- ReadPreferenceSetting{ReadPreference::PrimaryOnly},
- repl::ReadConcernLevel::kLocalReadConcern,
- NamespaceString(ChunkType::ConfigNS),
- BSON(ChunkType::ns() << "TestDB.TestColl"),
- BSON(ChunkType::DEPRECATED_lastmod << -1),
- boost::none));
+ getConfigShard()->exhaustiveFind(operationContext(),
+ ReadPreferenceSetting{ReadPreference::PrimaryOnly},
+ repl::ReadConcernLevel::kLocalReadConcern,
+ NamespaceString(ChunkType::ConfigNS),
+ BSON(ChunkType::ns() << "TestDB.TestColl"),
+ BSON(ChunkType::DEPRECATED_lastmod << -1),
+ boost::none));
const auto& chunksVector = findResponse.docs;
@@ -202,13 +202,13 @@ TEST_F(MergeChunkTest, NewMergeShouldClaimHighestVersion) {
"shard0000"));
auto findResponse = uassertStatusOK(
- getConfigShard()->exhaustiveFindOnConfig(operationContext(),
- ReadPreferenceSetting{ReadPreference::PrimaryOnly},
- repl::ReadConcernLevel::kLocalReadConcern,
- NamespaceString(ChunkType::ConfigNS),
- BSON(ChunkType::ns() << "TestDB.TestColl"),
- BSON(ChunkType::DEPRECATED_lastmod << -1),
- boost::none));
+ getConfigShard()->exhaustiveFind(operationContext(),
+ ReadPreferenceSetting{ReadPreference::PrimaryOnly},
+ repl::ReadConcernLevel::kLocalReadConcern,
+ NamespaceString(ChunkType::ConfigNS),
+ BSON(ChunkType::ns() << "TestDB.TestColl"),
+ BSON(ChunkType::DEPRECATED_lastmod << -1),
+ boost::none));
const auto& chunksVector = findResponse.docs;
@@ -265,13 +265,13 @@ TEST_F(MergeChunkTest, MergeLeavesOtherChunksAlone) {
"shard0000"));
auto findResponse = uassertStatusOK(
- getConfigShard()->exhaustiveFindOnConfig(operationContext(),
- ReadPreferenceSetting{ReadPreference::PrimaryOnly},
- repl::ReadConcernLevel::kLocalReadConcern,
- NamespaceString(ChunkType::ConfigNS),
- BSON(ChunkType::ns() << "TestDB.TestColl"),
- BSON(ChunkType::DEPRECATED_lastmod << -1),
- boost::none));
+ getConfigShard()->exhaustiveFind(operationContext(),
+ ReadPreferenceSetting{ReadPreference::PrimaryOnly},
+ repl::ReadConcernLevel::kLocalReadConcern,
+ NamespaceString(ChunkType::ConfigNS),
+ BSON(ChunkType::ns() << "TestDB.TestColl"),
+ BSON(ChunkType::DEPRECATED_lastmod << -1),
+ boost::none));
const auto& chunksVector = findResponse.docs;
@@ -401,13 +401,13 @@ TEST_F(MergeChunkTest, MergeAlreadyHappenedFailsPrecondition) {
// Verify that no change to config.chunks happened.
auto findResponse = uassertStatusOK(
- getConfigShard()->exhaustiveFindOnConfig(operationContext(),
- ReadPreferenceSetting{ReadPreference::PrimaryOnly},
- repl::ReadConcernLevel::kLocalReadConcern,
- NamespaceString(ChunkType::ConfigNS),
- BSON(ChunkType::ns() << "TestDB.TestColl"),
- BSON(ChunkType::DEPRECATED_lastmod << -1),
- boost::none));
+ getConfigShard()->exhaustiveFind(operationContext(),
+ ReadPreferenceSetting{ReadPreference::PrimaryOnly},
+ repl::ReadConcernLevel::kLocalReadConcern,
+ NamespaceString(ChunkType::ConfigNS),
+ BSON(ChunkType::ns() << "TestDB.TestColl"),
+ BSON(ChunkType::DEPRECATED_lastmod << -1),
+ boost::none));
const auto& chunksVector = findResponse.docs;