NODE-482 Connections definitely broken when connecting to a replica set in construction

Author: christkv

lib/mongo_client.js

@@ -9,7 +9,7 @@ var parse = require('./url_parser')
 
 /**
  * @fileOverview The **MongoClient** class is a class that allows for making Connections to MongoDB.
- * 
+ *
  * @example
  * var MongoClient = require('mongodb').MongoClient,
  *   test = require('assert');
@@ -52,7 +52,7 @@ function MongoClient() {
    * @param {object} [options.mongos=null] A hash of options to set on the mongos object, see **Mongos** constructor**
    * @param {MongoClient~connectCallback} callback The command result callback
    * @return {null}
-   */  
+   */
   this.connect = MongoClient.connect;
 }
 
@@ -74,21 +74,21 @@ function MongoClient() {
  * @param {object} [options.mongos=null] A hash of options to set on the mongos object, see **Mongos** constructor**
  * @param {MongoClient~connectCallback} callback The command result callback
  * @return {null}
- */  
+ */
 MongoClient.connect = function(url, options, callback) {
   var args = Array.prototype.slice.call(arguments, 1);
   callback = typeof args[args.length - 1] == 'function' ? args.pop() : null;
   options = args.length ? args.shift() : null;
   options = options || {};
 
-  // Set default empty server options  
+  // Set default empty server options
   var serverOptions = options.server || {};
   var mongosOptions = options.mongos || {};
   var replSetServersOptions = options.replSet || options.replSetServers || {};
   var dbOptions = options.db || {};
 
   // If callback is null throw an exception
-  if(callback == null) 
+  if(callback == null)
     throw new Error("no callback function provided");
 
   // Parse the string
@@ -109,10 +109,10 @@ MongoClient.connect = function(url, options, callback) {
 
   // Merge in any replicaset server options
   if(replSetServersOptions) {
-    for(var name in replSetServersOptions) object.rs_options[name] = replSetServersOptions[name];    
+    for(var name in replSetServersOptions) object.rs_options[name] = replSetServersOptions[name];
   }
 
-  if(replSetServersOptions.ssl 
+  if(replSetServersOptions.ssl
     || replSetServersOptions.sslValidate
     || replSetServersOptions.sslCA
     || replSetServersOptions.sslCert
@@ -128,15 +128,15 @@ MongoClient.connect = function(url, options, callback) {
 
   // Merge in any replicaset server options
   if(mongosOptions) {
-    for(var name in mongosOptions) object.mongos_options[name] = mongosOptions[name];    
+    for(var name in mongosOptions) object.mongos_options[name] = mongosOptions[name];
   }
 
   if(typeof object.server_options.poolSize == 'number') {
     if(!object.mongos_options.poolSize) object.mongos_options.poolSize = object.server_options.poolSize;
     if(!object.rs_options.poolSize) object.rs_options.poolSize = object.server_options.poolSize;
   }
 
-  if(mongosOptions.ssl 
+  if(mongosOptions.ssl
     || mongosOptions.sslValidate
     || mongosOptions.sslCA
     || mongosOptions.sslCert
@@ -203,17 +203,17 @@ MongoClient.connect = function(url, options, callback) {
     // Error
     var error = null;
     // Set up the Server object
-    var _server = object.servers[i].domain_socket 
+    var _server = object.servers[i].domain_socket
         ? new Server(object.servers[i].domain_socket, _server_options)
         : new Server(object.servers[i].host, object.servers[i].port, _server_options);
-        
+
     var setName;
 
-    var connectFunction = function(__server) { 
+    var connectFunction = function(__server) {
       // Attempt connect
       new Db(object.dbName, __server, {w:1, native_parser:false}).open(function(err, db) {
         // Update number of servers
-        totalNumberOfServers = totalNumberOfServers - 1;          
+        totalNumberOfServers = totalNumberOfServers - 1;
         // If no error do the correct checks
         if(!err) {
           // Close the connection
@@ -244,27 +244,32 @@ MongoClient.connect = function(url, options, callback) {
                 callback(new Error("cannot combine a list of replicaset seeds and mongos seeds"));
               } catch (err) {
                 throw err
-              }              
+              }
             })
           }
-          
-          if(totalNumberOfMongodServers == 0 
-            && totalNumberOfMongosServers == 0 
-            && object.servers.length == 1) {
+
+          if(totalNumberOfMongodServers == 0
+            && totalNumberOfMongosServers == 0
+            && object.servers.length == 1
+            && (!object.rs_options.replicaSet || !object.rs_options.rs_name)) {
             var obj = object.servers[0];
-            serverConfig = obj.domain_socket ? 
+            serverConfig = obj.domain_socket ?
                 new Server(obj.domain_socket, object.server_options)
-              : new Server(obj.host, obj.port, object.server_options);            
-          } else if(totalNumberOfMongodServers > 0 || totalNumberOfMongosServers > 0) {
+              : new Server(obj.host, obj.port, object.server_options);
+          } else if(totalNumberOfMongodServers > 0
+            || totalNumberOfMongosServers > 0
+            || object.rs_options.replicaSet || object.rs_options.rs_name) {
             var finalServers = object.servers
               .filter(function(serverObj) {
                 return errorServers[serverObj.host + ":" + serverObj.port] == null;
               })
               .map(function(serverObj) {
                 return new Server(serverObj.host, serverObj.port, object.server_options);
               });
+
             // Clean out any error servers
             errorServers = {};
+
             // Set up the final configuration
             if(totalNumberOfMongodServers > 0) {
               try {
@@ -276,7 +281,7 @@ MongoClient.connect = function(url, options, callback) {
                 return callback(err, null);
               }
             } else {
-              serverConfig = new Mongos(finalServers, object.mongos_options);                         
+              serverConfig = new Mongos(finalServers, object.mongos_options);
             }
           }
 
@@ -296,12 +301,12 @@ MongoClient.connect = function(url, options, callback) {
           // Set up all options etc and connect to the database
           _finishConnecting(serverConfig, object, options, callback)
         }
-      });        
+      });
     }
 
     // Wrap the context of the call
-    connectFunction(_server);    
-  }    
+    connectFunction(_server);
+  }
 }
 
 var _setNativeParser = function(db_options) {
@@ -345,7 +350,7 @@ var _finishConnecting = function(serverConfig, object, options, callback) {
   // Set up the db options
   var db = new Db(object.dbName, serverConfig, object.db_options);
   // Open the db
-  db.open(function(err, db){    
+  db.open(function(err, db){
 
     if(err) {
       return process.nextTick(function() {
@@ -379,7 +384,7 @@ var _finishConnecting = function(serverConfig, object, options, callback) {
         if(success){
           process.nextTick(function() {
             try {
-              callback(null, db);            
+              callback(null, db);
             } catch (err) {
               if(db) db.close();
               throw err
@@ -400,7 +405,7 @@ var _finishConnecting = function(serverConfig, object, options, callback) {
     } else {
       process.nextTick(function() {
         try {
-          callback(err, db);            
+          callback(err, db);
         } catch (err) {
           if(db) db.close();
           throw err