diff options
| author | Kevin Pulo <kevin.pulo@mongodb.com> | 2017-11-29 03:54:49 +0000 |
|---|---|---|
| committer | Kevin Pulo <kevin.pulo@mongodb.com> | 2017-12-18 05:47:06 +0000 |
| commit | 8a9090c4c59a840639f37c509fd0f2c6af252117 (patch) | |
| tree | bc129d2c254438a6a971eb246fa4b6246310096d /src/mongo/db/s/config/configsvr_remove_shard_command.cpp | |
| parent | 8467708af7fa83f8827362b80f56dab4aad30a41 (diff) | |
| download | mongo-8a9090c4c59a840639f37c509fd0f2c6af252117.tar.gz | |
SERVER-18138 catalog manager listing methods now return vectors
Diffstat (limited to 'src/mongo/db/s/config/configsvr_remove_shard_command.cpp')
| -rw-r--r-- | src/mongo/db/s/config/configsvr_remove_shard_command.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mongo/db/s/config/configsvr_remove_shard_command.cpp b/src/mongo/db/s/config/configsvr_remove_shard_command.cpp index ad4188d7647..d16fa7950c0 100644 --- a/src/mongo/db/s/config/configsvr_remove_shard_command.cpp +++ b/src/mongo/db/s/config/configsvr_remove_shard_command.cpp @@ -118,9 +118,8 @@ public: const auto shardDrainingStatus = uassertStatusOK(shardingCatalogManager->removeShard(opCtx, shard->getId())); - std::vector<std::string> databases; - uassertStatusOK( - shardingCatalogManager->getDatabasesForShard(opCtx, shard->getId(), &databases)); + std::vector<std::string> databases = + uassertStatusOK(shardingCatalogManager->getDatabasesForShard(opCtx, shard->getId())); // Get BSONObj containing: // 1) note about moving or dropping databases in a shard @@ -149,19 +148,18 @@ public: result.appendElements(dbInfo); break; case ShardDrainingStatus::ONGOING: { - std::vector<ChunkType> chunks; - Status status = Grid::get(opCtx)->catalogClient()->getChunks( + const auto swChunks = Grid::get(opCtx)->catalogClient()->getChunks( opCtx, BSON(ChunkType::shard(shard->getId().toString())), BSONObj(), boost::none, // return all - &chunks, nullptr, repl::ReadConcernLevel::kMajorityReadConcern); - if (!status.isOK()) { - return appendCommandStatus(result, status); + if (!swChunks.isOK()) { + return appendCommandStatus(result, swChunks.getStatus()); } + const auto& chunks = swChunks.getValue(); result.append("msg", "draining ongoing"); result.append("state", "ongoing"); result.append("remaining", |