diff options
author | Allison Easton <allison.easton@mongodb.com> | 2022-08-12 08:49:52 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-12 09:34:55 +0000 |
commit | c13c8d8997a25915f52afbd2a392c468fc63376a (patch) | |
tree | d3caacfccc6701e45344a373560ff3ad090e722a /src/mongo/s | |
parent | 412f7c46764ea072c6bd00f6d87197ae54922ab9 (diff) | |
download | mongo-c13c8d8997a25915f52afbd2a392c468fc63376a.tar.gz |
SERVER-68485 Merge and Split commands should not use the CSR to check the shard version
Diffstat (limited to 'src/mongo/s')
-rw-r--r-- | src/mongo/s/commands/cluster_merge_chunks_cmd.cpp | 1 | ||||
-rw-r--r-- | src/mongo/s/shard_util.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/mongo/s/commands/cluster_merge_chunks_cmd.cpp b/src/mongo/s/commands/cluster_merge_chunks_cmd.cpp index 05cddc1282f..70052f94d45 100644 --- a/src/mongo/s/commands/cluster_merge_chunks_cmd.cpp +++ b/src/mongo/s/commands/cluster_merge_chunks_cmd.cpp @@ -159,7 +159,6 @@ public: firstChunk.getShardId().toString()); remoteCmdObjB.append("epoch", shardVersion.epoch()); remoteCmdObjB.append("timestamp", shardVersion.getTimestamp()); - shardVersion.serialize(ChunkVersion::kChunkVersionField, &remoteCmdObjB); BSONObj remoteResult; diff --git a/src/mongo/s/shard_util.cpp b/src/mongo/s/shard_util.cpp index 67b5d4ed14f..d0f64821611 100644 --- a/src/mongo/s/shard_util.cpp +++ b/src/mongo/s/shard_util.cpp @@ -208,7 +208,6 @@ StatusWith<boost::optional<ChunkRange>> splitChunkAtMultiplePoints( cmd.append("keyPattern", shardKeyPattern.toBSON()); cmd.append("epoch", epoch); cmd.append("timestamp", timestamp); - shardVersion.serialize(ChunkVersion::kChunkVersionField, &cmd); chunkRange.append(&cmd); cmd.append("splitKeys", splitPointsBeginIt, splitPointsEndIt); |