diff options
| author | Enrico Golfieri <enrico.golfieri@mongodb.com> | 2022-09-01 11:59:40 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-01 15:03:59 +0000 |
| commit | 22f21e6e5a8086b3766485cc323ce9673587f30c (patch) | |
| tree | 47cb614c3f778d643b60b89a93d58d930eba2b62 /src/mongo/s/catalog | |
| parent | ab2d5005886706ebcb3f267181328f00f1707ceb (diff) | |
| download | mongo-22f21e6e5a8086b3766485cc323ce9673587f30c.tar.gz | |
SERVER-66297 get rid of maxSize
Diffstat (limited to 'src/mongo/s/catalog')
| -rw-r--r-- | src/mongo/s/catalog/sharding_catalog_client_test.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/s/catalog/type_shard.h | 2 | ||||
| -rw-r--r-- | src/mongo/s/catalog/type_shard_test.cpp | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/src/mongo/s/catalog/sharding_catalog_client_test.cpp b/src/mongo/s/catalog/sharding_catalog_client_test.cpp index 5ff6a5d5fff..551feda38b9 100644 --- a/src/mongo/s/catalog/sharding_catalog_client_test.cpp +++ b/src/mongo/s/catalog/sharding_catalog_client_test.cpp @@ -283,7 +283,6 @@ TEST_F(ShardingCatalogClientTest, GetAllShardsValid) { s1.setName("shard0000"); s1.setHost("ShardHost"); s1.setDraining(false); - s1.setMaxSizeMB(50); s1.setTags({"tag1", "tag2", "tag3"}); ShardType s2; @@ -293,7 +292,6 @@ TEST_F(ShardingCatalogClientTest, GetAllShardsValid) { ShardType s3; s3.setName("shard0002"); s3.setHost("ShardHost"); - s3.setMaxSizeMB(65); const vector<ShardType> expectedShardsList = {s1, s2, s3}; diff --git a/src/mongo/s/catalog/type_shard.h b/src/mongo/s/catalog/type_shard.h index cc10535de03..4f75dabad74 100644 --- a/src/mongo/s/catalog/type_shard.h +++ b/src/mongo/s/catalog/type_shard.h @@ -135,6 +135,8 @@ private: boost::optional<std::string> _host; // (O) is it draining chunks? boost::optional<bool> _draining; + + // TODO SERVER-68430 remove maxSizeMB field after 7.0 branches out // (O) maximum allowed disk space in MB boost::optional<long long> _maxSizeMB; // (O) shard tags diff --git a/src/mongo/s/catalog/type_shard_test.cpp b/src/mongo/s/catalog/type_shard_test.cpp index d2c9ab0326e..05e009ff3d5 100644 --- a/src/mongo/s/catalog/type_shard_test.cpp +++ b/src/mongo/s/catalog/type_shard_test.cpp @@ -63,17 +63,7 @@ TEST(ShardType, OnlyMandatory) { TEST(ShardType, AllOptionalsPresent) { BSONObj obj = BSON(ShardType::name("shard0000") - << ShardType::host("localhost:27017") << ShardType::draining(true) - << ShardType::maxSizeMB(100)); - StatusWith<ShardType> shardRes = ShardType::fromBSON(obj); - ASSERT(shardRes.isOK()); - ShardType shard = shardRes.getValue(); - ASSERT(shard.validate().isOK()); -} - -TEST(ShardType, MaxSizeAsFloat) { - BSONObj obj = BSON(ShardType::name("shard0000") - << ShardType::host("localhost:27017") << ShardType::maxSizeMB() << 100.0); + << ShardType::host("localhost:27017") << ShardType::draining(true)); StatusWith<ShardType> shardRes = ShardType::fromBSON(obj); ASSERT(shardRes.isOK()); ShardType shard = shardRes.getValue(); |