From d64c98deed2440ae0f3700dc373bf8b97886030c Mon Sep 17 00:00:00 2001 From: Spencer T Brody Date: Mon, 24 Aug 2015 15:53:54 -0400 Subject: SERVER-19855 Do not perform shard version checking where not necessary This reverts commit 045cd1070cae1e7827255850c2fe35194e48b24e. --- src/mongo/db/s/migration_source_manager.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mongo/db/s/migration_source_manager.h') diff --git a/src/mongo/db/s/migration_source_manager.h b/src/mongo/db/s/migration_source_manager.h index 0475e771fcd..4921610332d 100644 --- a/src/mongo/db/s/migration_source_manager.h +++ b/src/mongo/db/s/migration_source_manager.h @@ -34,6 +34,7 @@ #include "mongo/base/disallow_copying.h" #include "mongo/bson/bsonobj.h" +#include "mongo/db/namespace_string.h" #include "mongo/stdx/condition_variable.h" namespace mongo { @@ -131,7 +132,7 @@ private: long long& size, bool explode); - std::string _getNS() const; + NamespaceString _getNS() const; // All member variables are labeled with one of the following codes indicating the // synchronization rules for accessing them. @@ -166,7 +167,7 @@ private: // If a migration is currently active. bool _active{false}; // (MG) - std::string _ns; // (MG) + NamespaceString _nss; // (MG) BSONObj _min; // (MG) BSONObj _max; // (MG) BSONObj _shardKeyPattern; // (MG) -- cgit v1.2.1