SERVER-10818 send shardName and version with every batch write request

1 files changed, 2 insertions, 4 deletions

diff --git a/src/mongo/s/d_logic.h b/src/mongo/s/d_logic.h
index 41045811a81..25e3b14d5f6 100644
--- a/src/mongo/s/d_logic.h
+++ b/src/mongo/s/d_logic.h
@@ -61,10 +61,9 @@ namespace mongo {
         static void initialize(const string& server);
 
         void gotShardName( const string& name );
-        void gotShardHost( string host );
+        bool setShardName( const string& name ); // Same as above, does not throw
 
-        string getShardName() { return _shardName; }
-        string getShardHost() { return _shardHost; }
+        string getShardName() { scoped_lock lk(_mutex); return _shardName; }
 
         /** Reverts back to a state where this mongod is not sharded. */
         void resetShardingState(); 
@@ -261,7 +260,6 @@ namespace mongo {
         string _configServer;
 
         string _shardName;
-        string _shardHost;
 
         // protects state below
         mutable mongo::mutex _mutex;