summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2020-09-04 06:21:51 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-04 11:52:20 +0000
commit3f9e675017474fd53b6cc149ea492aed95b8c92d (patch)
treef08bc2ff71c6f0b4ad0d2376c8b1812a1b317df2
parent77bee7548c4ea1ec635bd387cfb417204098c16f (diff)
downloadmongo-3f9e675017474fd53b6cc149ea492aed95b8c92d.tar.gz
SERVER-46199 Get rid of the BM_IncrementalRefreshWithNoChange benchmark
This test is incompatible with making the RoutingTableHistory movable, done under 3df9c61b7747058cd84edd7a875b1524db57dd1d. In order to preserve the same performance characteristic, the check for whether any changes have happened to the routing info was pulled at a higher level, in the CatalogCache.
-rw-r--r--src/mongo/s/chunk_manager.cpp1
-rw-r--r--src/mongo/s/chunk_manager_refresh_bm.cpp19
2 files changed, 0 insertions, 20 deletions
diff --git a/src/mongo/s/chunk_manager.cpp b/src/mongo/s/chunk_manager.cpp
index fece210d762..5713855e01f 100644
--- a/src/mongo/s/chunk_manager.cpp
+++ b/src/mongo/s/chunk_manager.cpp
@@ -735,7 +735,6 @@ RoutingTableHistory RoutingTableHistory::makeUpdated(
// If at least one diff was applied, the collection's version must have advanced
invariant(getVersion().epoch() == chunkMap.getVersion().epoch());
- invariant(getVersion().isOlderThan(chunkMap.getVersion()));
return RoutingTableHistory(_nss,
_uuid,
diff --git a/src/mongo/s/chunk_manager_refresh_bm.cpp b/src/mongo/s/chunk_manager_refresh_bm.cpp
index 600196ea120..a3feba2de1e 100644
--- a/src/mongo/s/chunk_manager_refresh_bm.cpp
+++ b/src/mongo/s/chunk_manager_refresh_bm.cpp
@@ -116,25 +116,6 @@ MONGO_COMPILER_NOINLINE auto runIncrementalUpdate(const CollectionMetadata& cm,
ShardId("shard0"));
}
-void BM_IncrementalRefreshWithNoChange(benchmark::State& state) {
- const int nShards = state.range(0);
- const int nChunks = state.range(1);
- auto metadata = makeChunkManagerWithOptimalBalancedDistribution(nShards, nChunks);
-
- auto postMoveVersion = metadata.getChunkManager()->getVersion();
- std::vector<ChunkType> newChunks;
- newChunks.emplace_back(kNss, getRangeForChunk(1, nChunks), postMoveVersion, ShardId("shard0"));
-
- for (auto keepRunning : state) {
- benchmark::DoNotOptimize(runIncrementalUpdate(metadata, newChunks));
- }
-}
-
-BENCHMARK(BM_IncrementalRefreshWithNoChange)
- ->Args({2, 50000})
- ->Args({2, 250000})
- ->Args({2, 500000});
-
void BM_IncrementalRefreshOfPessimalBalancedDistribution(benchmark::State& state) {
const int nShards = state.range(0);
const int nChunks = state.range(1);