summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2023-03-02 15:57:13 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-03-02 17:26:25 +0000
commit48a03d225d30b44b2ac00b7111ef8608a41c34de (patch)
treebbf0925bb00e29bcd1f65873d2b88ebff9ab90b1
parent0397c51e59b5c64b014b5d1f241889391d1c74e5 (diff)
downloadmongo-48a03d225d30b44b2ac00b7111ef8608a41c34de.tar.gz
Revert "SERVER-70640 Add migrationConcurrency to serverStatus"
This reverts commit cc379041cd9c42ab9d2b1eed97011e3f7d6189ef.
-rw-r--r--jstests/sharding/move_chunk_concurrent_cloning.js6
-rw-r--r--src/mongo/db/s/migration_destination_manager.cpp3
-rw-r--r--src/mongo/db/s/sharding_statistics.cpp3
-rw-r--r--src/mongo/db/s/sharding_statistics.h3
4 files changed, 0 insertions, 15 deletions
diff --git a/jstests/sharding/move_chunk_concurrent_cloning.js b/jstests/sharding/move_chunk_concurrent_cloning.js
index 8ce55176b3c..dfd04e3eb5e 100644
--- a/jstests/sharding/move_chunk_concurrent_cloning.js
+++ b/jstests/sharding/move_chunk_concurrent_cloning.js
@@ -93,12 +93,6 @@ const runParallelMoveChunk = (numThreads) => {
shardKeyIdx--;
assert.eq(shardKeyIdx, kInitialLoadFinalKey + 1000);
- // server Status on the receiving shard
- var serverStatus = st.shard1.getDB('admin').runCommand({serverStatus: 1});
-
- assert.eq(kThreadCount,
- serverStatus.shardingStatistics.chunkMigrationConcurrency,
- tojson(serverStatus));
st.stop();
MongoRunner.stopMongod(staticMongod);
};
diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp
index 2f5230b1702..4cbcf6cb260 100644
--- a/src/mongo/db/s/migration_destination_manager.cpp
+++ b/src/mongo/db/s/migration_destination_manager.cpp
@@ -489,9 +489,6 @@ Status MigrationDestinationManager::start(OperationContext* opCtx,
_sessionMigration = std::make_unique<SessionCatalogMigrationDestination>(
_nss, _fromShard, *_sessionId, _cancellationSource.token());
ShardingStatistics::get(opCtx).countRecipientMoveChunkStarted.addAndFetch(1);
- if (mongo::feature_flags::gConcurrencyInChunkMigration.isEnabledAndIgnoreFCV())
- ShardingStatistics::get(opCtx).chunkMigrationConcurrencyCnt.store(
- chunkMigrationConcurrency.load());
_migrateThreadHandle = stdx::thread([this, cancellationToken = _cancellationSource.token()]() {
_migrateThread(cancellationToken);
diff --git a/src/mongo/db/s/sharding_statistics.cpp b/src/mongo/db/s/sharding_statistics.cpp
index ea17a500202..a32642776dd 100644
--- a/src/mongo/db/s/sharding_statistics.cpp
+++ b/src/mongo/db/s/sharding_statistics.cpp
@@ -34,7 +34,6 @@
#include "mongo/bson/bsonobjbuilder.h"
#include "mongo/db/operation_context.h"
#include "mongo/db/service_context.h"
-#include "mongo/s/sharding_feature_flags_gen.h"
namespace mongo {
namespace {
@@ -70,8 +69,6 @@ void ShardingStatistics::report(BSONObjBuilder* builder) const {
countDonorMoveChunkAbortConflictingIndexOperation.load());
builder->append("unfinishedMigrationFromPreviousPrimary",
unfinishedMigrationFromPreviousPrimary.load());
- if (mongo::feature_flags::gConcurrencyInChunkMigration.isEnabledAndIgnoreFCV())
- builder->append("chunkMigrationConcurrency", chunkMigrationConcurrencyCnt.load());
}
} // namespace mongo
diff --git a/src/mongo/db/s/sharding_statistics.h b/src/mongo/db/s/sharding_statistics.h
index 91a10cc4308..b4332452a8d 100644
--- a/src/mongo/db/s/sharding_statistics.h
+++ b/src/mongo/db/s/sharding_statistics.h
@@ -104,9 +104,6 @@ struct ShardingStatistics {
// completion. Valid only when this process is the repl set primary.
AtomicWord<long long> unfinishedMigrationFromPreviousPrimary{0};
- // Current number for chunkMigrationConcurrency that defines concurrent fetchers and inserters
- // used for _migrateClone(step 4) of chunk migration
- AtomicWord<int> chunkMigrationConcurrencyCnt{1};
/**
* Obtains the per-process instance of the sharding statistics object.
*/