fixed; socketOptions shared between all servers

Instead of sharing the socketOptions object (and host/port) between replset servers we now create seperate objects. The only reason this issue didnt outright break anything earlier was due to the ConnectionPool being started within the same tick as its construction (luck).

Author: aheckmann

lib/mongodb/connection/repl_set.js

@@ -5,7 +5,6 @@ var Connection = require('./connection').Connection,
  debug = require('util').debug,
  inherits = require('util').inherits,
  inspect = require('util').inspect,
- utils = require('../utils'),
  Server = require('./server').Server,
  PingStrategy = require('./strategies/ping_strategy').PingStrategy,
  StatisticsStrategy = require('./strategies/statistics_strategy').StatisticsStrategy,
@@ -727,7 +726,9 @@ ReplSet.prototype.connect = function(parent, options, callback) {
  this._state = new ReplSet.State();
 
  // Ensure parent can do a slave query if it's set
- parent.slaveOk = this.slaveOk ? this.slaveOk : parent.slaveOk;
+ parent.slaveOk = this.slaveOk
+ ? this.slaveOk
+ : parent.slaveOk;
 
  // Remove any listeners
  this.removeAllListeners("fullsetup");
@@ -760,48 +761,32 @@ ReplSet.prototype.connect = function(parent, options, callback) {
  // Get server addresses
  var addresses = this._state.addresses;
 
- // Default empty socket options object
- var socketOptions = {};
-
- // Set fast connect timeout
- socketOptions['connectTimeoutMS'] = this._connectTimeoutMS;
-
- // If ssl is specified
- if(this.ssl)
- socketOptions.ssl = true;
-
- // If a socket option object exists clone it
- if(utils.isObject(this.socketOptions)) {
- var keys = Object.keys(this.socketOptions);
- for(var j = 0; j < keys.length; j++)
- socketOptions[keys[j]] = this.socketOptions[keys[j]];
- }
-
  // De-duplicate any servers
- var server;
+ var server, key;
  for(var i = 0; i < this.servers.length; i++) {
  server = this.servers[i];
- // Add host information to socket options
- socketOptions['host'] = server.host;
- socketOptions['port'] = server.port;
- server.socketOptions = socketOptions;
- server.replicasetInstance = this;
- server.enableRecordQueryStats(this.recordQueryStats);
- // If server does not exist set it
- if(addresses[server.host + ":" + server.port] == null) {
- addresses[server.host + ":" + server.port] = server;
+ key = server.host + ":" + server.port;
+ if(null == addresses[key]) {
+ addresses[key] = server;
  }
  }
 
  // Get the list of servers that is deduplicated and start connecting
  var candidateServers = [];
  var keys = Object.keys(addresses);
  for(var i = 0; i < keys.length; i++) {
- candidateServers.push(addresses[keys[i]]);
+ server = addresses[keys[i]];
+ server.assignReplicaSet(this);
+ candidateServers.push(server);
  }
+
  // Let's connect to the first one on the list
  server = candidateServers.pop();
- server.connect(parent, {returnIsMasterResults: true, eventReceiver:server}, _connectHandler(this, candidateServers, server));
+ var opts = {
+ returnIsMasterResults: true,
+ eventReceiver: server
+ }
+ server.connect(parent, opts, _connectHandler(this, candidateServers, server));
 }
 
 /**

lib/mongodb/connection/server.js

@@ -5,6 +5,7 @@ var Connection = require('./connection').Connection,
  ConnectionPool = require('./connection_pool').ConnectionPool,
  EventEmitter = require('events').EventEmitter,
  Base = require('./base').Base,
+ utils = require('../utils'),
  inherits = require('util').inherits;
 
 /**
@@ -50,6 +51,7 @@ function Server(host, port, options) {
  this.ssl = this.options.ssl == null ? false : this.options.ssl;
  this.slaveOk = this.options["slave_ok"];
  this._used = false;
+ this.replicasetInstance = null;
 
  // Get the readPreference
  var readPreference = this.options['readPreference'];
@@ -165,10 +167,46 @@ Server.prototype.allServerInstances = function() {
  * @ignore
  */
 Server.prototype.isSetMember = function() {
- return this['replicasetInstance'] != null || this['mongosInstance'] != null;
+ return this.replicasetInstance != null || this.mongosInstance != null;
 }
 
 /**
+ * Assigns a replica set to this `server`.
+ *
+ * @param {ReplSet} replset
+ * @ignore
+ */
+Server.prototype.assignReplicaSet = function (replset) {
+ this.replicasetInstance = replset;
+ this.inheritReplSetOptionsFrom(replset);
+ this.enableRecordQueryStats(replset.recordQueryStats);
+}
+
+/**
+ * Takes needed options from `replset` and overwrites
+ * our own options.
+ *
+ * @param {ReplSet} replset
+ * @ignore
+ */
+Server.prototype.inheritReplSetOptionsFrom = function (replset) {
+ this.socketOptions = {};
+ this.socketOptions.connectTimeoutMS = replset._connectTimeoutMS;
+
+ if(replset.ssl)
+ this.socketOptions.ssl = true;
+
+ // If a socket option object exists clone it
+ if(utils.isObject(replset.socketOptions)) {
+ var keys = Object.keys(replset.socketOptions);
+ for(var i = 0; i < keys.length; i++)
+ this.socketOptions[keys[i]] = replset.socketOptions[keys[i]];
+ }
+}
+
+/**
+ * Opens this server connection.
+ *
  * @ignore
  */
 Server.prototype.connect = function(dbInstance, options, callback) {