diff options
author | Esha Maharishi <esha.maharishi@mongodb.com> | 2016-08-11 20:50:01 -0400 |
---|---|---|
committer | Esha Maharishi <esha.maharishi@mongodb.com> | 2016-08-11 21:07:39 -0400 |
commit | d1223a8ad44d6bc91766f0bd05a08820cdb1fdea (patch) | |
tree | cbf51e562e432452193d238abd9f13c84db4ebf4 /src/mongo/db/s/operation_sharding_state.cpp | |
parent | 6c6bf0284642a7fe1138888d6c3044a6f4912468 (diff) | |
download | mongo-d1223a8ad44d6bc91766f0bd05a08820cdb1fdea.tar.gz |
SERVER-22663 Make --shardsvr required for a mongod to be used as a shard
Diffstat (limited to 'src/mongo/db/s/operation_sharding_state.cpp')
-rw-r--r-- | src/mongo/db/s/operation_sharding_state.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mongo/db/s/operation_sharding_state.cpp b/src/mongo/db/s/operation_sharding_state.cpp index 97991dc27f8..5d0cad65b52 100644 --- a/src/mongo/db/s/operation_sharding_state.cpp +++ b/src/mongo/db/s/operation_sharding_state.cpp @@ -54,11 +54,6 @@ void OperationShardingState::initializeShardVersion(NamespaceString nss, const BSONElement& shardVersionElt) { invariant(!hasShardVersion()); - if (nss.isSystemDotIndexes()) { - setShardVersion(std::move(nss), ChunkVersion::IGNORED()); - return; - } - if (shardVersionElt.eoo() || shardVersionElt.type() != BSONType::Array) { return; } @@ -89,7 +84,6 @@ ChunkVersion OperationShardingState::getShardVersion(const NamespaceString& nss) void OperationShardingState::setShardVersion(NamespaceString nss, ChunkVersion newVersion) { // This currently supports only setting the shard version for one namespace. invariant(!_hasVersion || _ns == nss); - invariant(!nss.isSystemDotIndexes() || ChunkVersion::isIgnoredVersion(newVersion)); _ns = std::move(nss); _shardVersion = std::move(newVersion); |