summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Myers <nathan.myers@10gen.com>2016-12-21 17:41:49 -0500
committerNathan Myers <nathan.myers@10gen.com>2016-12-21 17:41:49 -0500
commit90eb5b55a2b5dec67fd414f80c3a6ca965c7d567 (patch)
treee8e29f0f5ff3f71bfcd4fe8bda8e97ed042efa61 /src
parent6c4794728036f4a5e9169b895e2a9fb6c328812b (diff)
downloadmongo-90eb5b55a2b5dec67fd414f80c3a6ca965c7d567.tar.gz
Revert "SERVER-27383 Balancer should skip dropped collections" (sp)
This reverts commit 865a2da42dc56ca77f32a07cac5b7130ed21d7d0.
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp8
-rw-r--r--src/mongo/s/catalog/type_collection.h4
2 files changed, 0 insertions, 12 deletions
diff --git a/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp b/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp
index 2dc66b905a2..487cd76739e 100644
--- a/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp
+++ b/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp
@@ -209,10 +209,6 @@ StatusWith<SplitInfoVector> BalancerChunkSelectionPolicyImpl::selectChunksToSpli
SplitInfoVector splitCandidates;
for (const auto& coll : collections) {
- if (coll.getDropped()) {
- continue;
- }
-
const NamespaceString nss(coll.getNs());
auto candidatesStatus = _getSplitCandidatesForCollection(txn, nss, shardStats);
@@ -261,10 +257,6 @@ StatusWith<MigrateInfoVector> BalancerChunkSelectionPolicyImpl::selectChunksToMo
MigrateInfoVector candidateChunks;
for (const auto& coll : collections) {
- if (coll.getDropped()) {
- continue;
- }
-
const NamespaceString nss(coll.getNs());
if (!coll.getAllowBalance()) {
diff --git a/src/mongo/s/catalog/type_collection.h b/src/mongo/s/catalog/type_collection.h
index 06c51be3b55..f86edf46066 100644
--- a/src/mongo/s/catalog/type_collection.h
+++ b/src/mongo/s/catalog/type_collection.h
@@ -61,10 +61,6 @@ public:
/**
* Constructs a new DatabaseType object from BSON. Also does validation of the contents.
- *
- * Dropped collections accumulate in the collections list, through 3.6, so that
- * mongos <= 3.4.x, when it retrieves the list from the config server, can delete its
- * cache entries for dropped collections. See SERVER-27475, SERVER-27474
*/
static StatusWith<CollectionType> fromBSON(const BSONObj& source);