mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-28 07:59:02 +01:00
Code Issues Releases Activity

SERVER-17586 Update ShardVersionMap in ChunkManager when shard is deleted during balancing

Browse Source 
Fix dbtest ChunkManagerLoadBasicTest so that it actually inserts a shard document into
config.shards.
This commit is contained in:
Daniel Alabi 2015-03-18 15:24:07 -04:00
parent c887c1e141
commit b91ea55090
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mongo/dbtests/sharding.cpp
View File

@ -44,6 +44,7 @@
#include "mongo/s/config.h"
#include "mongo/s/type_chunk.h"
#include "mongo/s/type_collection.h"
#include "mongo/s/type_shard.h"
#include "mongo/util/log.h"
namespace ShardingTests {
@ -121,6 +122,10 @@ namespace ShardingTests {
false /* draining */);
// Need to run this to ensure the shard is in the global lookup table
Shard::installShard(_shard.getName(), _shard);
// Add dummy shard to config DB
_client.insert(ShardType::ConfigNS,
BSON(ShardType::name() << _shard.getName() <<
ShardType::host() << _shard.getConnString()));
// Create an index so that diffing works correctly, otherwise no cursors from S&O
ASSERT_OK(dbtests::createIndex(

26
src/mongo/s/chunk_manager.cpp
View File

@ -158,7 +158,7 @@ namespace {
ShardVersionMap shardVersions;
Timer t;
bool success = _load(config, chunkMap, shards, shardVersions, oldManager);
bool success = _load(config, chunkMap, shards, &shardVersions, oldManager);
if( success ){
{
@ -201,7 +201,7 @@ namespace {
bool ChunkManager::_load(const string& config,
ChunkMap& chunkMap,
set<Shard>& shards,
ShardVersionMap& shardVersions,
ShardVersionMap* shardVersions,
const ChunkManager* oldManager)
{
@ -215,7 +215,7 @@ namespace {
// Get the old max version
_version = oldManager->getVersion();
// Load a copy of the old versions
shardVersions = oldManager->_shardVersions;
*shardVersions = oldManager->_shardVersions;
// Load a copy of the chunk map, replacing the chunk manager with our own
const ChunkMap& oldChunkMap = oldManager->getChunkMap();
@ -243,7 +243,7 @@ namespace {
// Attach a diff tracker for the versioned chunk data
CMConfigDiffTracker differ( this );
differ.attach( _ns, chunkMap, _version, shardVersions );
differ.attach( _ns, chunkMap, _version, *shardVersions );
// Diff tracker should *always* find at least one chunk if collection exists
int diffsApplied = differ.calculateConfigDiff(config);
@ -252,9 +252,17 @@ namespace {
LOG(2) << "loaded " << diffsApplied << " chunks into new chunk manager for " << _ns
<< " with version " << _version;
// Add all the shards we find to the shards set
for( ShardVersionMap::iterator it = shardVersions.begin(); it != shardVersions.end(); it++ ){
shards.insert( it->first );
// Add all existing shards we find to the shards set
for (ShardVersionMap::iterator it = shardVersions->begin();
it != shardVersions->end();
) {
if (Shard::findIfExists(it->first).ok()) {
shards.insert(it->first);
++it;
}
else {
shardVersions->erase(it++);
}
}
return true;
@ -267,7 +275,7 @@ namespace {
// Set all our data to empty
chunkMap.clear();
shardVersions.clear();
shardVersions->clear();
_version = ChunkVersion( 0, 0, OID() );
return true;
@ -291,7 +299,7 @@ namespace {
// Set all our data to empty to be extra safe
chunkMap.clear();
shardVersions.clear();
shardVersions->clear();
_version = ChunkVersion( 0, 0, OID() );
return allInconsistent;

2
src/mongo/s/chunk_manager.h
View File

@ -224,7 +224,7 @@ namespace mongo {
bool _load(const std::string& config,
ChunkMap& chunks,
std::set<Shard>& shards,
ShardVersionMap& shardVersions,
ShardVersionMap* shardVersions,
const ChunkManager* oldManager);
static bool _isValid(const ChunkMap& chunks);