Test fixes and upgraded topology manager

mongodb · Jan 3, 2017 · 2bb9a7b · 2bb9a7b
1 parent 8f768ef
commit 2bb9a7b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,11 @@
+2.2.17 2017-01-02
+-----------------
+* updated createCollection doc options and linked to create command.
+* Updated mongodb-core to 2.1.3.
+  * Monitoring operations are re-scheduled in pool if it cannot find a connection that does not already have scheduled work on it, this is to avoid the monitoring socket timeout being applied to any existing operations on the socket due to pipelining
+  * Moved replicaset monitoring away from serial mode and to parallel mode.
+  * updated bson and bson-ext dependencies to 1.0.2.
+
 2.2.16 2016-12-13
 -----------------
 * NODE-899 reversed upsertedId change to bring back old behavior.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,8 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.1.2",
-    "mongodb-core": "christkv/mongodb-core#2.0",
+    "mongodb-core": "2.1.3",
     "readable-stream": "2.1.5"
   },
   "devDependencies": {

diff --git a/test/functional/authentication_tests.js b/test/functional/authentication_tests.js
@@ -1731,7 +1731,7 @@ var shardedManager;
 
 var setUpSharded = function(configuration, options, callback) {
   // var ShardingManager = require('mongodb-tools').ShardingManager
-  var ShardingManager = require('../test_topologies').Sharded
+  var ShardingManager = require('../topology_test_definitions').Sharded
     , Db = configuration.require.Db
     , Server = configuration.require.Server
     , MongoClient = configuration.require.MongoClient

diff --git a/test/runner.js b/test/runner.js
@@ -27,7 +27,7 @@ var argv = require('optimist')
 // MongoDB Topology Manager
 var ServerManager = require('mongodb-topology-manager').Server,
   ReplSetManager = require('mongodb-topology-manager').ReplSet,
-  ShardingManager = require('./test_topologies.js').Sharded;
+  ShardingManager = require('./topology_test_definitions.js').Sharded;
 
 // Skipping parameters
 var startupOptions = {
@@ -130,13 +130,13 @@ var Configuration = function(options) {
                 });
               });
             }).catch(function(err) {
-              // console.log(err.stack);
+              console.log(err.stack);
             });
           }).catch(function(err) {
-            // console.log(err.stack);
+            console.log(err.stack);
           });
         }).catch(function(err) {
-          // console.log(err.stack);
+          console.log(err.stack);
         });
       },
 

diff --git a/test/test_topologies.js → test/topology_test_definitions.js b/test/test_topologies.js → test/topology_test_definitions.js
@@ -7,11 +7,20 @@ var P = global.Promise || require('es6-promise'),
   f = require('util').format;
 
 var Sharded = function(options, clientOptions) {
+  // console.log("================= ShardingManager 0")
   this.topology = new ShardingManager({
     mongod: 'mongod',
     mongos: 'mongos'
   });
 
+  // console.log("================= ShardingManager")
+  // console.dir(this.topology)
+
+  // this.topology.on('state', function(state) {
+  //   console.log("========= received state")
+  //   console.dir(state)
+  // })
+
   // Additional options needed
   this.options = options || {};
   this.clientOptions = clientOptions || {};
@@ -25,19 +34,19 @@ Sharded.prototype.start = function(callback) {
     var nodes1 = [{
       tags: {"loc":"ny"},
       options: {
-        bind_ip: 'localhost', port: 31010, dbpath: f('%s/../db/31000', __dirname)
+        bind_ip: 'localhost', port: 31010, dbpath: f('%s/../db/31000', __dirname), shardsvr:null
       }
     }, {
       tags: {"loc":"sf"},
       options: {
-        bind_ip: 'localhost', port: 31011, dbpath: f('%s/../db/31001', __dirname)
+        bind_ip: 'localhost', port: 31011, dbpath: f('%s/../db/31001', __dirname), shardsvr:null
       }
     }, {
       // Type of node
       arbiter: true,
       // mongod process options
       options: {
-        bind_ip: 'localhost', port: 31012, dbpath: f('%s/../db/31002', __dirname)
+        bind_ip: 'localhost', port: 31012, dbpath: f('%s/../db/31002', __dirname), shardsvr:null
       }
     }];
 
@@ -59,19 +68,19 @@ Sharded.prototype.start = function(callback) {
       var nodes2 = [{
         tags: {"loc":"ny"},
         options: {
-          bind_ip: 'localhost', port: 31020, dbpath: f('%s/../db/31010', __dirname)
+          bind_ip: 'localhost', port: 31020, dbpath: f('%s/../db/31010', __dirname), shardsvr:null
         }
       }, {
         tags: {"loc":"sf"},
         options: {
-          bind_ip: 'localhost', port: 31021, dbpath: f('%s/../db/31011', __dirname)
+          bind_ip: 'localhost', port: 31021, dbpath: f('%s/../db/31011', __dirname), shardsvr:null
         }
       }, {
         // Type of node
         arbiter: true,
         // mongod process options
         options: {
-          bind_ip: 'localhost', port: 31022, dbpath: f('%s/../db/31012', __dirname)
+          bind_ip: 'localhost', port: 31022, dbpath: f('%s/../db/31012', __dirname), shardsvr:null
         }
       }];