Updated version to V2.2.15 including mongodb-core 2.1.2

Author: christkv

HISTORY.md

@@ -1,3 +1,9 @@
+2.2.15 2016-12-10
+-----------------
+* Updated mongodb-core to 2.1.2.
+  * Delay topologyMonitoring on successful attemptReconnect as no need to run a full scan immediately.
+  * Emit reconnect event in primary joining when in connected status for a replicaset (Fixes mongoose reconnect issue).
+
 2.2.14 2016-12-08
 -----------------
 * Updated mongodb-core to 2.1.1.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "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.1",
-    "mongodb-core": "christkv/mongodb-core#2.0",
+    "mongodb-core": "2.1.2",
     "readable-stream": "2.1.5"
   },
   "devDependencies": {

test/functional/readconcern_tests.js

@@ -272,7 +272,7 @@ exports['Should error out with readConcern level set to majority'] = {
 }
 
 exports['Should set majority readConcern aggregate command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -311,7 +311,7 @@ exports['Should set majority readConcern aggregate command'] = {
 }
 
 exports['Should set majority readConcern aggregate command but ignore due to out'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -359,7 +359,7 @@ exports['Should set majority readConcern aggregate command but ignore due to out
 }
 
 exports['Should set majority readConcern mapReduce command but be ignored'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.9" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -402,7 +402,7 @@ exports['Should set majority readConcern mapReduce command but be ignored'] = {
 }
 
 exports['Should set majority readConcern distinct command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -445,7 +445,7 @@ exports['Should set majority readConcern distinct command'] = {
 }
 
 exports['Should set majority readConcern count command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -488,7 +488,7 @@ exports['Should set majority readConcern count command'] = {
 }
 
 exports['Should set majority readConcern group command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -530,7 +530,7 @@ exports['Should set majority readConcern group command'] = {
   }
 }
 exports['Should set majority readConcern parallelCollectionScan command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -573,7 +573,7 @@ exports['Should set majority readConcern parallelCollectionScan command'] = {
 }
 
 exports['Should set majority readConcern geoNear command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});
@@ -620,7 +620,7 @@ exports['Should set majority readConcern geoNear command'] = {
 }
 
 exports['Should set majority readConcern geoSearch command'] = {
-  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.1.8" } },
+  metadata: { requires: { topology: 'replicaset', mongodb: ">= 3.2.0" } },
 
   test: function(configuration, test) {
     var listener = require('../..').instrument(function(err, instrumentations) {});

test/runner.js

@@ -14,7 +14,8 @@ var Runner = require('integra').Runner
   , OSFilter = require('./filters/os_filter')
   , TravisFilter = require('./filters/travis_filter')
   , FileFilter = require('integra').FileFilter
-  , TestNameFilter = require('integra').TestNameFilter;
+  , TestNameFilter = require('integra').TestNameFilter
+  , semver = require('semver');
 
 var detector = require('gleak')();
 var smokePlugin = require('./smoke_plugin.js');
@@ -94,28 +95,42 @@ var Configuration = function(options) {
   return function(context) {
     return {
       start: function(callback) {
-        // console.log("------------ start 0")
         var self = this;
         if(skipStart) return callback();
-        // console.log("------------ start 1")
 
-        // Purge the database
-        manager.purge().then(function() {
-          console.log("[purge the directories]");
+        manager.discover().then(function(result) {
+          // Create string representation
+          var currentVersion = result.version.join('.');
+          // If we have a ReplSetManager and the version is >= 3.4.0
+          if(semver.satisfies(currentVersion, ">=3.4.0")) {
+            if(manager instanceof ReplSetManager) {
+              manager.managers = manager.managers.map(function(manager) {
+                manager.options.enableMajorityReadConcern = null;
+                return manager;
+              });
+            }
+          }
+
+          // Purge the database
+          manager.purge().then(function() {
+            console.log("[purge the directories]");
 
-          var Logger = require('mongodb-topology-manager').Logger;
-          manager.start().then(function() {
-            console.log("[started the topology]");
             var Logger = require('mongodb-topology-manager').Logger;
-            // Logger.setLevel('info');
-            // Create an instance
-            new mongo.Db(self.db, topology(host, port)).open(function(err, db) {
-              if(err) return callback(err);
-
-              db.dropDatabase(function(err) {
-                db.close();
-                callback();
+            manager.start().then(function() {
+              console.log("[started the topology]");
+              var Logger = require('mongodb-topology-manager').Logger;
+              // Logger.setLevel('info');
+              // Create an instance
+              new mongo.Db(self.db, topology(host, port)).open(function(err, db) {
+                if(err) return callback(err);
+
+                db.dropDatabase(function(err) {
+                  db.close();
+                  callback();
+                });
               });
+            }).catch(function(err) {
+              // console.log(err.stack);
             });
           }).catch(function(err) {
             // console.log(err.stack);