mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 01:21:03 +01:00
Code Issues Releases Activity

SERVER-9976 buildbot metadata_loader_test debug make sure we test optional fields

Browse Source
This commit is contained in:
Greg Studer 2013-06-20 10:42:27 -04:00
parent 714a9c6feb
commit 38d638004c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mongo/s/metadata_loader.cpp
View File

@ -124,7 +124,7 @@ namespace mongo {
// Load or generate default chunks for collection config.
//
if ( !collDoc.getKeyPattern().isEmpty() ) {
if ( collDoc.isKeyPatternSet() && !collDoc.getKeyPattern().isEmpty() ) {
metadata->_keyPattern = collDoc.getKeyPattern();
metadata->_shardVersion = ChunkVersion( 0, 0, collDoc.getEpoch() );
@ -132,7 +132,7 @@ namespace mongo {
return Status::OK();
}
else if ( collDoc.getPrimary() == shard ) {
else if ( collDoc.isPrimarySet() && collDoc.getPrimary() == shard ) {
if ( shard == "" ) {
warning() << "shard not verified, assuming collection " << ns
@ -147,8 +147,8 @@ namespace mongo {
}
else {
errMsg = str::stream() << "collection " << ns << " does not have a shard key "
<< "and primary " << collDoc.getPrimary()
<< " does not match this shard " << shard;
<< "and primary " << ( collDoc.isPrimarySet() ? collDoc.getPrimary() : "" )
<< " does not match this shard " << shard;
return Status( ErrorCodes::RemoteChangeDetected, errMsg );
}
}