diff options
author | Esha Maharishi <esha.maharishi@mongodb.com> | 2018-03-01 10:59:07 -0500 |
---|---|---|
committer | Esha Maharishi <esha.maharishi@mongodb.com> | 2018-03-01 10:59:07 -0500 |
commit | 39730f6fe7212761b86aa2308c0e128d58b0a656 (patch) | |
tree | 467b60ebfa977271937e95c611e8e83377cb06c9 /src | |
parent | 2a4328dca297c8c1f76dafcff958c75703881207 (diff) | |
download | mongo-39730f6fe7212761b86aa2308c0e128d58b0a656.tar.gz |
SERVER-33547 remove backwards compatibility check for shardVersion on OSS in splitChunk
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/s/split_chunk_command.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mongo/db/s/split_chunk_command.cpp b/src/mongo/db/s/split_chunk_command.cpp index f38eae9b314..b1ee8b1f822 100644 --- a/src/mongo/db/s/split_chunk_command.cpp +++ b/src/mongo/db/s/split_chunk_command.cpp @@ -147,18 +147,7 @@ public: } OID expectedCollectionEpoch; - if (cmdObj.hasField("epoch")) { - auto epochStatus = bsonExtractOIDField(cmdObj, "epoch", &expectedCollectionEpoch); - uassert( - ErrorCodes::InvalidOptions, "unable to parse collection epoch", epochStatus.isOK()); - } else { - // Backwards compatibility with v3.4 mongos, which will send 'shardVersion' and not - // 'epoch'. - const auto& oss = OperationShardingState::get(opCtx); - uassert( - ErrorCodes::InvalidOptions, "collection version is missing", oss.hasShardVersion()); - expectedCollectionEpoch = oss.getShardVersion(nss).epoch(); - } + uassertStatusOK(bsonExtractOIDField(cmdObj, "epoch", &expectedCollectionEpoch)); auto statusWithOptionalChunkRange = splitChunk( opCtx, nss, keyPatternObj, chunkRange, splitKeys, shardName, expectedCollectionEpoch); |