Updated mongodb-core to 1.3.12. Mongos setting acceptableLatencyMS exposed to control the latency women for mongos selection.

Author: christkv

HISTORY.md

@@ -1,3 +1,11 @@
+2.1.12 2016-03-29
+-----------------
+* Updated mongodb-core to 1.3.12.
+* Mongos setting acceptableLatencyMS exposed to control the latency women for mongos selection.
+* Mongos pickProxies fall back to closest mongos if no proxies meet latency window specified.
+* isConnected method for mongos uses same selection code as getServer.
+* Exceptions in cursor getServer trapped and correctly delegated to high level handler.
+
 2.1.11 2016-03-23
 -----------------
 * Updated mongodb-core to 1.3.10.

docs/reference/content/reference/connecting/connection-settings.md

@@ -152,6 +152,7 @@ The table below shows all settings and what topology they affect.
 | **haInterval** | ReplicaSet, Mongos | integer | 10000,5000 | Time between each replicaset status check. |
 | **replicaSet** | ReplicaSet | string | null | The name of the replicaset to connect to. |
 | **secondaryAcceptableLatencyMS** | ReplicaSet | integer | 15 | Sets the range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms). |
+| **acceptableLatencyMS** | Mongos | integer | 15 | Sets the range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms). |
 | **connectWithNoPrimary** | ReplicaSet | boolean | false | Sets if the driver should connect even if no primary is available. |
 | **authSource** | Server, ReplicaSet, Mongos | string | null | If the database authentication is dependent on another databaseName. |
 | **w** | Server, ReplicaSet, Mongos | string, integer| null | The write concern. |

lib/mongo_client.js

@@ -123,7 +123,7 @@ var replsetOptions = ['ha', 'haInterval', 'replicaSet', 'secondaryAcceptableLate
 
 var mongosOptions = ['ha', 'haInterval', 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate',
  'sslCA', 'sslCert', 'sslKey', 'sslPass', 'noDelay', 'keepAlive', 'connectTimeoutMS',
- 'socketTimeoutMS'];
+ 'socketTimeoutMS', 'acceptableLatencyMS'];
 
 var dbOptions = ['authSource', 'w', 'wtimeout', 'j', 'native_parser', 'forceServerObjectId',
  'serializeFunctions', 'ignoreUndefined', 'raw', 'promoteLongs', 'bufferMaxEntries', 'readPreference',

lib/mongos.js

@@ -44,6 +44,7 @@ var EventEmitter = require('events').EventEmitter
  * @param {booelan} [options.ha=true] Turn on high availability monitoring.
  * @param {number} [options.haInterval=5000] Time between each replicaset status check.
  * @param {number} [options.poolSize=5] Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons.
+ * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for MongoS proxy selection
  * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support)
  * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
  * @param {object} [options.sslValidate=true] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
@@ -164,8 +165,8 @@ var Mongos = function(servers, options) {
  finalOptions.noDelay = options.socketOptions.noDelay;
  }
 
- if(typeof options.secondaryAcceptableLatencyMS == 'number') {
- finalOptions.acceptableLatency = options.secondaryAcceptableLatencyMS;
+ if(typeof options.acceptableLatencyMS == 'number') {
+ finalOptions.localThresholdMS = options.acceptableLatencyMS || 15;
  }
 
  // Add the non connection store

package.json

@@ -1,6 +1,6 @@
 {
  "name": "mongodb",
- "version": "2.1.11",
+ "version": "2.1.12",
  "description": "The official MongoDB driver for Node.js",
  "main": "index.js",
  "repository": {
@@ -14,7 +14,7 @@
  ],
  "dependencies": {
  "es6-promise": "3.0.2",
- "mongodb-core": "1.3.10",
+ "mongodb-core": "1.3.11",
  "readable-stream": "1.0.31"
  },
  "devDependencies": {

test/functional/mongo_client_tests.js

@@ -232,7 +232,7 @@ exports['Should correctly pass through extra sharded options'] = {
  mongos: {
  ha:false
  , haInterval: 10000
- , secondaryAcceptableLatencyMS: 100
+ , acceptableLatencyMS: 100
  , poolSize: 1
  , socketOptions: {
  noDelay: false
@@ -244,7 +244,7 @@ exports['Should correctly pass through extra sharded options'] = {
  }, function(err, db) {
  test.equal(false, db.s.topology.s.clonedOptions.ha);
  test.equal(10000, db.s.topology.s.clonedOptions.haInterval);
- test.equal(100, db.s.topology.s.clonedOptions.acceptableLatency);
+ test.equal(100, db.s.topology.s.clonedOptions.localThresholdMS);
  test.equal(1, db.s.topology.s.clonedOptions.poolSize);
 
  test.equal(444444, db.s.topology.s.clonedOptions.connectionTimeout);