CXX-444 Backport server r2.6.6..r2.6.7 changes

Author: acmorrow

src/mongo/client/dbclient_rs.cpp

@@ -178,6 +178,13 @@ namespace {
         return rsm->getServerAddress();
     }
 
+    HostAndPort DBClientReplicaSet::getSuspectedPrimaryHostAndPort() const {
+        if (!_master) {
+            return HostAndPort();
+        }
+        return _master->getServerHostAndPort();
+    }
+
     void DBClientReplicaSet::setRunCommandHook(DBClientWithCommands::RunCommandHookFunc func) {
         // Set the hooks in both our sub-connections and in ourselves.
         if (_master) {

src/mongo/client/dbclient_rs.h

@@ -133,6 +133,17 @@ namespace mongo {
 
         // ----- informational ----
 
+        /**
+         * Gets the replica set name of the set we are connected to.
+         */
+        const std::string& getSetName() const { return _setName; }
+
+        /**
+         * Returns the HostAndPort of the server this connection believes belongs to the primary,
+         * or returns an empty HostAndPort if it doesn't know about a current primary.
+         */
+        HostAndPort getSuspectedPrimaryHostAndPort() const;
+
         double getSoTimeout() const { return _so_timeout; }
 
         string toString() const { return getServerAddress(); }

src/mongo/client/dbclientinterface.h

@@ -1302,6 +1302,7 @@ namespace mongo {
         }
 
         string getServerAddress() const { return _serverString; }
+        const HostAndPort& getServerHostAndPort() const { return _server; }
 
         virtual void killCursor( long long cursorID );
         virtual bool callRead( Message& toSend , Message& response ) { return call( toSend , response ); }

src/mongo/s/shard.h

@@ -47,8 +47,7 @@ namespace mongo {
 
         Shard( const Shard& other )
             : _name( other._name ) , _addr( other._addr ) , _cs( other._cs ) , 
-              _maxSize( other._maxSize ) , _isDraining( other._isDraining ),
-              _tags( other._tags ) {
+              _maxSize( other._maxSize ) , _isDraining( other._isDraining ) {
         }
 
         Shard( const Shard* other )
@@ -138,9 +137,6 @@ namespace mongo {
          */
         bool containsNode( const string& node ) const;
 
-        const set<string>& tags() const { return _tags; }
-        void addTag( const string& tag ) { _tags.insert( tag ); }
-
         static void getAllShards( vector<Shard>& all );
         static void printShardInfo( ostream& out );
         static Shard lookupRSName( const string& name);
@@ -168,7 +164,6 @@ namespace mongo {
         ConnectionString _cs;
         long long _maxSize;    // in MBytes, 0 is unlimited
         bool      _isDraining; // shard is currently being removed
-        set<string> _tags;
     };
     typedef shared_ptr<Shard> ShardPtr;
 

src/mongo/util/version.cpp

@@ -31,7 +31,7 @@ namespace mongo {
      *      1.2.3-rc4-pre-
      * If you really need to do something else you'll need to fix _versionArray()
      */
-    const char versionString[] = "2.6.6";
+    const char versionString[] = "2.6.7";
 
     // See unit test for example outputs
     BSONArray toVersionArray(const char* version){