SERVER-1418 Shard names now use padding zeroes

1 files changed, 23 insertions, 2 deletions

diff --git a/s/config.cpp b/s/config.cpp
index 30d4ba03a4c..de023060db1 100644
--- a/s/config.cpp
+++ b/s/config.cpp
@@ -337,13 +337,34 @@ namespace mongo {
     
     /* --- Grid --- */
     
-    bool Grid::knowAboutShard( string name ) const{
+    bool Grid::knowAboutShard( const string& name ) const{
         ShardConnection conn( configServer.getPrimary() , "" );
-        BSONObj shard = conn->findOne( "config.shards" , BSON( "host" << name ) );
+        BSONObj shard = conn->findOne( ShardNS::shard , BSON( "host" << name ) );
         conn.done();
         return ! shard.isEmpty();
     }
 
+    string Grid::getNewShardName() const{
+        ShardConnection conn( configServer.getPrimary() , "" );
+
+        string shardName;
+        int count = 0; 
+        BSONObj o = conn->findOne( ShardNS::shard , Query( fromjson ( "{_id: /^shard/}" ) ).sort(  BSON( "_id" << -1 ) ) ); 
+        if ( ! o.isEmpty() ) {
+            string last = o["_id"].String();
+            istringstream is( last.substr( 5 ) );
+            is >> count;
+            count++;
+        }                                                                                                               
+        if (count < 9999) {
+            stringstream ss;
+            ss << "shard" << setfill('0') << setw(4) << count;
+            shardName = ss.str();
+        }
+        conn.done();
+        return shardName;
+    }
+
     DBConfigPtr Grid::getDBConfig( string database , bool create ){
         {
             string::size_type i = database.find( "." );