From 9864240aa66da3275fb689de7ae5393cd867362f Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Wed, 22 Feb 2017 17:51:16 -0500 Subject: SERVER-28111 Cleanup the ChunkManager No functional changes, just removing unused includes and adding comments. (cherry picked from commit cb6777a14200f501542dad8cf07591a885a08070) --- src/mongo/db/commands/mr.cpp | 1 + src/mongo/s/catalog_cache.cpp | 13 ++--- src/mongo/s/chunk_manager.cpp | 87 ++++++++++++++----------------- src/mongo/s/chunk_manager.h | 88 ++++++++++++++++++-------------- src/mongo/s/commands/commands_public.cpp | 5 +- src/mongo/s/commands/strategy.cpp | 1 + src/mongo/s/sharding_raii.h | 3 -- 7 files changed, 98 insertions(+), 100 deletions(-) (limited to 'src') diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp index e3d29d16a19..64a36bc16c0 100644 --- a/src/mongo/db/commands/mr.cpp +++ b/src/mongo/db/commands/mr.cpp @@ -73,6 +73,7 @@ #include "mongo/s/catalog_cache.h" #include "mongo/s/chunk.h" #include "mongo/s/chunk_manager.h" +#include "mongo/s/client/shard_connection.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" #include "mongo/s/shard_key_pattern.h" diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp index f5523546a8c..b8cec8396de 100644 --- a/src/mongo/s/catalog_cache.cpp +++ b/src/mongo/s/catalog_cache.cpp @@ -49,7 +49,7 @@ StatusWith> CatalogCache::getDatabase(OperationContext StringData dbName) { stdx::lock_guard guard(_mutex); - ShardedDatabasesMap::iterator it = _databases.find(dbName); + auto it = _databases.find(dbName); if (it != _databases.end()) { return it->second; } @@ -64,14 +64,11 @@ StatusWith> CatalogCache::getDatabase(OperationContext auto db = std::make_shared(dbOpTimePair.value, dbOpTimePair.opTime); try { db->load(txn); - } catch (const DBException& excep) { - return excep.toStatus(); + auto emplaceResult = _databases.try_emplace(dbName, std::move(db)); + return emplaceResult.first->second; + } catch (const DBException& ex) { + return ex.toStatus(); } - - auto emplaceResult = _databases.try_emplace(dbName, std::move(db)); - invariant(emplaceResult.second); - - return emplaceResult.first->second; } void CatalogCache::invalidate(StringData dbName) { diff --git a/src/mongo/s/chunk_manager.cpp b/src/mongo/s/chunk_manager.cpp index afddc3158d5..fa14a893e66 100644 --- a/src/mongo/s/chunk_manager.cpp +++ b/src/mongo/s/chunk_manager.cpp @@ -33,29 +33,21 @@ #include "mongo/s/chunk_manager.h" #include -#include -#include #include #include "mongo/bson/simple_bsonobj_comparator.h" -#include "mongo/bson/util/bson_extract.h" #include "mongo/client/read_preference.h" -#include "mongo/client/remote_command_targeter.h" #include "mongo/db/matcher/extensions_callback_noop.h" -#include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collation_index_key.h" #include "mongo/db/query/index_bounds_builder.h" #include "mongo/db/query/query_planner.h" #include "mongo/db/query/query_planner_common.h" -#include "mongo/rpc/get_status_from_command_result.h" -#include "mongo/s/balancer_configuration.h" #include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/catalog_cache.h" #include "mongo/s/chunk_diff.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/config.h" #include "mongo/s/grid.h" -#include "mongo/s/shard_util.h" #include "mongo/util/log.h" #include "mongo/util/timer.h" @@ -163,13 +155,13 @@ bool isChunkMapValid(const ChunkMap& chunkMap) { } // namespace -ChunkManager::ChunkManager(const NamespaceString& nss, +ChunkManager::ChunkManager(NamespaceString nss, const OID& epoch, const ShardKeyPattern& shardKeyPattern, std::unique_ptr defaultCollator, bool unique) : _sequenceNumber(nextCMSequenceNumber.addAndFetch(1)), - _ns(nss.ns()), + _nss(std::move(nss)), _keyPattern(shardKeyPattern.getKeyPattern()), _defaultCollator(std::move(defaultCollator)), _unique(unique), @@ -193,7 +185,8 @@ void ChunkManager::loadExistingRanges(OperationContext* txn, const ChunkManager* Timer t; - log() << "ChunkManager loading chunks for " << _ns << " sequenceNumber: " << _sequenceNumber + log() << "ChunkManager loading chunks for " << _nss + << " sequenceNumber: " << _sequenceNumber << " based on: " << (oldManager ? oldManager->getVersion().toString() : "(empty)"); if (_load(txn, chunkMap, shardIds, &shardVersions, oldManager)) { @@ -219,7 +212,7 @@ void ChunkManager::loadExistingRanges(OperationContext* txn, const ChunkManager* // This will abort construction so we should never have a reference to an invalid config msgasserted(13282, - str::stream() << "Couldn't load a valid config for " << _ns + str::stream() << "Couldn't load a valid config for " << _nss.ns() << " after 3 attempts. Please try again."); } @@ -248,13 +241,13 @@ bool ChunkManager::_load(OperationContext* txn, chunkMap.emplace(oldC->getMax(), std::make_shared(*oldC)); } - LOG(2) << "loading chunk manager for collection " << _ns + LOG(2) << "loading chunk manager for collection " << _nss << " using old chunk manager w/ version " << _version.toString() << " and " << oldChunkMap.size() << " chunks"; } // Attach a diff tracker for the versioned chunk data - CMConfigDiffTracker differ(_ns, &chunkMap, &_version, shardVersions, this); + CMConfigDiffTracker differ(_nss.ns(), &chunkMap, &_version, shardVersions, this); // Diff tracker should *always* find at least one chunk if collection exists // Get the diff query required @@ -276,7 +269,7 @@ bool ChunkManager::_load(OperationContext* txn, int diffsApplied = differ.calculateConfigDiff(txn, chunks); if (diffsApplied > 0) { - LOG(2) << "loaded " << diffsApplied << " chunks into new chunk manager for " << _ns + LOG(2) << "loaded " << diffsApplied << " chunks into new chunk manager for " << _nss << " with version " << _version; // Add all existing shards we find to the shards set @@ -296,7 +289,7 @@ bool ChunkManager::_load(OperationContext* txn, return true; } else if (diffsApplied == 0) { // No chunks were found for the ns - warning() << "no chunks found when reloading " << _ns << ", previous version was " + warning() << "no chunks found when reloading " << _nss << ", previous version was " << _version; // Set all our data to empty @@ -312,12 +305,12 @@ bool ChunkManager::_load(OperationContext* txn, bool allInconsistent = (differ.numValidDiffs() == 0); if (allInconsistent) { // All versions are different, this can be normal - warning() << "major change in chunk information found when reloading " << _ns + warning() << "major change in chunk information found when reloading " << _nss << ", previous version was " << _version; } else { // Inconsistent load halfway through (due to yielding cursor during load) // should be rare - warning() << "inconsistent chunks found when reloading " << _ns + warning() << "inconsistent chunks found when reloading " << _nss << ", previous version was " << _version << ", this should be rare"; } @@ -360,7 +353,7 @@ StatusWith> ChunkManager::findIntersectingChunk(OperationConte msgasserted(8070, str::stream() << "couldn't find a chunk intersecting: " << shardKey << " for ns: " - << _ns + << _nss.ns() << " at version: " << _version.toString() << ", number of chunks: " @@ -377,9 +370,8 @@ StatusWith> ChunkManager::findIntersectingChunk(OperationConte log() << redact(shardKey); // Proactively force a reload on the chunk manager in case it somehow got inconsistent - const NamespaceString nss(_ns); - auto config = uassertStatusOK(Grid::get(txn)->catalogCache()->getDatabase(txn, nss.db())); - config->getChunkManagerIfExists(txn, nss.ns(), true); + auto config = uassertStatusOK(Grid::get(txn)->catalogCache()->getDatabase(txn, _nss.db())); + config->getChunkManagerIfExists(txn, _nss.ns(), true); msgasserted(13141, "Chunk map pointed to incorrect chunk"); } @@ -398,7 +390,7 @@ void ChunkManager::getShardIdsForQuery(OperationContext* txn, const BSONObj& query, const BSONObj& collation, set* shardIds) const { - auto qr = stdx::make_unique(NamespaceString(_ns)); + auto qr = stdx::make_unique(_nss); qr->setFilter(query); if (!collation.isEmpty()) { @@ -407,10 +399,8 @@ void ChunkManager::getShardIdsForQuery(OperationContext* txn, qr->setCollation(_defaultCollator->getSpec().toBSON()); } - auto statusWithCQ = CanonicalQuery::canonicalize(txn, std::move(qr), ExtensionsCallbackNoop()); - - uassertStatusOK(statusWithCQ.getStatus()); - unique_ptr cq = std::move(statusWithCQ.getValue()); + std::unique_ptr cq = + uassertStatusOK(CanonicalQuery::canonicalize(txn, std::move(qr), ExtensionsCallbackNoop())); // Query validation if (QueryPlannerCommon::hasNode(cq->root(), MatchExpression::GEO_NEAR)) { @@ -443,11 +433,12 @@ void ChunkManager::getShardIdsForQuery(OperationContext* txn, BoundList ranges = _keyPattern.flattenBounds(bounds); for (BoundList::const_iterator it = ranges.begin(); it != ranges.end(); ++it) { - getShardIdsForRange(*shardIds, it->first /*min*/, it->second /*max*/); + getShardIdsForRange(it->first /*min*/, it->second /*max*/, shardIds); // once we know we need to visit all shards no need to keep looping - if (shardIds->size() == _shardIds.size()) + if (shardIds->size() == _shardIds.size()) { break; + } } // SERVER-4914 Some clients of getShardIdsForQuery() assume at least one shard will be returned. @@ -458,9 +449,9 @@ void ChunkManager::getShardIdsForQuery(OperationContext* txn, } } -void ChunkManager::getShardIdsForRange(set& shardIds, - const BSONObj& min, - const BSONObj& max) const { +void ChunkManager::getShardIdsForRange(const BSONObj& min, + const BSONObj& max, + std::set* shardIds) const { auto it = _chunkRangeMap.upper_bound(min); auto end = _chunkRangeMap.upper_bound(max); @@ -473,11 +464,11 @@ void ChunkManager::getShardIdsForRange(set& shardIds, } for (; it != end; ++it) { - shardIds.insert(it->second.getShardId()); + shardIds->insert(it->second.getShardId()); // No need to iterate through the rest of the ranges, because we already know we need to use // all shards. - if (shardIds.size() == _shardIds.size()) { + if (shardIds->size() == _shardIds.size()) { break; } } @@ -539,7 +530,7 @@ IndexBounds ChunkManager::getIndexBoundsForQuery(const BSONObj& key, } IndexBounds ChunkManager::collapseQuerySolution(const QuerySolutionNode* node) { - if (node->children.size() == 0) { + if (node->children.empty()) { invariant(node->getType() == STAGE_IXSCAN); const IndexScanNode* ixNode = static_cast(node); @@ -563,6 +554,7 @@ IndexBounds ChunkManager::collapseQuerySolution(const QuerySolutionNode* node) { } IndexBounds bounds; + for (std::vector::const_iterator it = node->children.begin(); it != node->children.end(); it++) { @@ -577,11 +569,13 @@ IndexBounds ChunkManager::collapseQuerySolution(const QuerySolutionNode* node) { } IndexBounds childBounds = collapseQuerySolution(*it); - if (childBounds.size() == 0) { // Got unexpected node in query solution tree + if (childBounds.size() == 0) { + // Got unexpected node in query solution tree return IndexBounds(); } invariant(childBounds.size() == bounds.size()); + for (size_t i = 0; i < bounds.size(); i++) { bounds.fields[i].intervals.insert(bounds.fields[i].intervals.end(), childBounds.fields[i].intervals.begin(), @@ -603,27 +597,22 @@ bool ChunkManager::compatibleWith(const ChunkManager& other, const ShardId& shar } ChunkVersion ChunkManager::getVersion(const ShardId& shardName) const { - ShardVersionMap::const_iterator i = _shardVersions.find(shardName); - if (i == _shardVersions.end()) { - // Shards without explicitly tracked shard versions (meaning they have - // no chunks) always have a version of (0, 0, epoch). Note this is - // *different* from the dropped chunk version of (0, 0, OID(000...)). - // See s/chunk_version.h. + auto it = _shardVersions.find(shardName); + if (it == _shardVersions.end()) { + // Shards without explicitly tracked shard versions (meaning they have no chunks) always + // have a version of (0, 0, epoch) return ChunkVersion(0, 0, _version.epoch()); } - return i->second; -} -ChunkVersion ChunkManager::getVersion() const { - return _version; + return it->second; } string ChunkManager::toString() const { StringBuilder sb; - sb << "ChunkManager: " << _ns << " key:" << _keyPattern.toString() << '\n'; + sb << "ChunkManager: " << _nss.ns() << " key:" << _keyPattern.toString() << '\n'; - for (ChunkMap::const_iterator i = _chunkMap.begin(); i != _chunkMap.end(); ++i) { - sb << "\t" << i->second->toString() << '\n'; + for (const auto& entry : _chunkMap) { + sb << "\t" << entry.second->toString() << '\n'; } return sb.str(); diff --git a/src/mongo/s/chunk_manager.h b/src/mongo/s/chunk_manager.h index f2d75fdb0b0..f184c60ee5a 100644 --- a/src/mongo/s/chunk_manager.h +++ b/src/mongo/s/chunk_manager.h @@ -33,6 +33,7 @@ #include #include "mongo/base/disallow_copying.h" +#include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/optime.h" #include "mongo/s/catalog/type_chunk.h" @@ -46,17 +47,19 @@ namespace mongo { class CanonicalQuery; struct QuerySolutionNode; -class NamespaceString; class OperationContext; -// The key for the map is max for each Chunk or ChunkRange -typedef BSONObjIndexedMap> ChunkMap; +// Ordered map from the max for each chunk to an entry describing the chunk +using ChunkMap = BSONObjIndexedMap>; + +// Map from a shard is to the max chunk version on that shard +using ShardVersionMap = std::map; class ChunkManager { MONGO_DISALLOW_COPYING(ChunkManager); public: - ChunkManager(const NamespaceString& nss, + ChunkManager(NamespaceString nss, const OID& epoch, const ShardKeyPattern& shardKeyPattern, std::unique_ptr defaultCollator, @@ -64,8 +67,15 @@ public: ~ChunkManager(); + /** + * Returns an increasing number of the reload sequence number of this chunk manager. + */ + unsigned long long getSequenceNumber() const { + return _sequenceNumber; + } + const std::string& getns() const { - return _ns; + return _nss.ns(); } const ShardKeyPattern& getShardKeyPattern() const { @@ -80,12 +90,16 @@ public: return _unique; } - /** - * An increasing number of how many ChunkManagers we have so we know if something has been - * updated. - */ - unsigned long long getSequenceNumber() const { - return _sequenceNumber; + ChunkVersion getVersion() const { + return _version; + } + + const ChunkMap& getChunkMap() const { + return _chunkMap; + } + + int numChunks() const { + return _chunkMap.size(); } // Loads existing ranges based on info in chunk manager @@ -95,10 +109,6 @@ public: // Methods to use once loaded / created // - int numChunks() const { - return _chunkMap.size(); - } - /** * Given a key that has been extracted from a document, returns the * chunk that contains that key. @@ -116,7 +126,7 @@ public: const BSONObj& shardKey, const BSONObj& collation) const; - /* + /** * Finds the intersecting chunk, assuming the simple collation. */ std::shared_ptr findIntersectingChunkWithSimpleCollation(OperationContext* txn, @@ -131,14 +141,18 @@ public: const BSONObj& collation, std::set* shardIds) const; - void getAllShardIds(std::set* all) const; + /** + * Returns all shard ids which contain chunks overlapping the range [min, max]. Please note the + * inclusive bounds on both sides (SERVER-20768). + */ + void getShardIdsForRange(const BSONObj& min, + const BSONObj& max, + std::set* shardIds) const; - /** @param shardIds set to the shard ids for shards - * covered by the interval [min, max], see SERVER-4791 + /** + * Returns the ids of all shards on which the collection has any chunks. */ - void getShardIdsForRange(std::set& shardIds, - const BSONObj& min, - const BSONObj& max) const; + void getAllShardIds(std::set* all) const; // Transforms query into bounds for each field in the shard key // for example : @@ -159,10 +173,6 @@ public: // => { a: (0, 1), (2, 3), b: (0, 1), (2, 3) } static IndexBounds collapseQuerySolution(const QuerySolutionNode* node); - const ChunkMap& getChunkMap() const { - return _chunkMap; - } - /** * Returns true if, for this shard, the chunks are identical in both chunk managers */ @@ -171,7 +181,6 @@ public: std::string toString() const; ChunkVersion getVersion(const ShardId& shardName) const; - ChunkVersion getVersion() const; /** * Returns the opTime of config server the last time chunks were loaded. @@ -205,13 +214,8 @@ private: ShardId _shardId; }; - // Contains a compressed map of what range of keys resides on which shard. The index is the max - // key of the respective range and the union of all ranges in a such constructed map must cover - // the complete space from [MinKey, MaxKey). using ChunkRangeMap = BSONObjIndexedMap; - using ShardVersionMap = std::map; - /** * If load was successful, returns true and it is guaranteed that the _chunkMap and * _chunkRangeMap are consistent with each other. If false is returned, it is not safe to use @@ -229,20 +233,28 @@ private: static ChunkRangeMap _constructRanges(const ChunkMap& chunkMap); // The shard versioning mechanism hinges on keeping track of the number of times we reload - // ChunkManagers. Increasing this number here will prompt checkShardVersion to refresh the - // connection-level versions to the most up to date value. + // ChunkManagers. const unsigned long long _sequenceNumber; - std::string _ns; + // Namespace to which this routing information corresponds + const NamespaceString _nss; - ShardKeyPattern _keyPattern; + // The key pattern used to shard the collection + const ShardKeyPattern _keyPattern; - std::unique_ptr _defaultCollator; + // Default collation to use for routing data queries for this collection + const std::unique_ptr _defaultCollator; - bool _unique; + // Whether the sharding key is unique + const bool _unique; + // Map from the max for each chunk to an entry describing the chunk. The union of all chunks' + // ranges must cover the complete space from [MinKey, MaxKey). ChunkMap _chunkMap; + // Transformation of the chunk map containing what range of keys reside on which shard. The + // index is the max key of the respective range and the union of all ranges in a such + // constructed map must cover the complete space from [MinKey, MaxKey). ChunkRangeMap _chunkRangeMap; std::set _shardIds; diff --git a/src/mongo/s/commands/commands_public.cpp b/src/mongo/s/commands/commands_public.cpp index 6736adc7443..7f9209774d2 100644 --- a/src/mongo/s/commands/commands_public.cpp +++ b/src/mongo/s/commands/commands_public.cpp @@ -888,8 +888,9 @@ public: double numObjects = 0; int millis = 0; - set shardIds; - cm->getShardIdsForRange(shardIds, min, max); + std::set shardIds; + cm->getShardIdsForRange(min, max, &shardIds); + for (const ShardId& shardId : shardIds) { const auto shardStatus = Grid::get(txn)->shardRegistry()->getShard(txn, shardId); if (!shardStatus.isOK()) { diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp index ff2efb798d5..9fdd459a2c7 100644 --- a/src/mongo/s/commands/strategy.cpp +++ b/src/mongo/s/commands/strategy.cpp @@ -56,6 +56,7 @@ #include "mongo/s/catalog_cache.h" #include "mongo/s/chunk_manager.h" #include "mongo/s/chunk_version.h" +#include "mongo/s/client/shard_connection.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/commands/cluster_explain.h" #include "mongo/s/grid.h" diff --git a/src/mongo/s/sharding_raii.h b/src/mongo/s/sharding_raii.h index 1ec3da85b14..92d5858f36b 100644 --- a/src/mongo/s/sharding_raii.h +++ b/src/mongo/s/sharding_raii.h @@ -34,10 +34,7 @@ namespace mongo { -class DBConfig; class OperationContext; -template -class StatusWith; class ScopedShardDatabase { MONGO_DISALLOW_COPYING(ScopedShardDatabase); -- cgit v1.2.1