Added better support for domains in 0.10.X and 0.11.X, added some fixes for write concern errors in downconversion

Author: christkv

lib/mongodb/collection/batch/common.js

@@ -244,19 +244,19 @@ var mergeBatchResults = function(ordered, batch, bulkResult, err, result) {
  return;
  }
 
- //
- // NEEDED to pass tests as some write errors are
- // returned as write concern errors (j write on non journal mongod)
- // also internal error code 75 is still making it out as a write concern error
- //
- if(result && result.writeConcernError
- && (result.writeConcernError.code == 2 || result.writeConcernError.code == 75)) {
- console.log("Should not happen as errors 2 and 75 should be top level errors");
-
- bulkResult.ok = 0;
- bulkResult.error = utils.toError(new WriteConcernError(result.writeConcernError));
- return;
- }
+ // //
+ // // NEEDED to pass tests as some write errors are
+ // // returned as write concern errors (j write on non journal mongod)
+ // // also internal error code 75 is still making it out as a write concern error
+ // //
+ // if(result && result.writeConcernError
+ //  && (result.writeConcernError.code == 2 || result.writeConcernError.code == 75)) {
+ //  console.log("Should not happen as errors 2 and 75 should be top level errors");
+
+ //  bulkResult.ok = 0;
+ //  bulkResult.error = utils.toError(new WriteConcernError(result.writeConcernError));
+ //  return;
+ // }
 
  // If we have an insert Batch type
  if(batch.batchType == INSERT) {
@@ -324,7 +324,8 @@ var mergeLegacyResults = function(_ordered, _op, _batch, _results, _result, _ind
  if(_results.ok == 0) return false;
 
  // Handle error
- if(_result.errmsg || _result.err || _result instanceof Error) {
+ if((_result.errmsg || _result.err || _result instanceof Error) 
+ && (_result.wtimeout == null && _result.jnote == null && _result.wnote == null)) {
  var code = _result.code || UNKNOWN_ERROR; // Returned error code or unknown code
  var errmsg = _result.errmsg || _result.err;
  errmsg = errmsg || _result.message;
@@ -378,6 +379,14 @@ var mergeLegacyResults = function(_ordered, _op, _batch, _results, _result, _ind
  _results.nRemoved = _results.nRemoved + _result;
  }
 
+ // We have a write concern error, add a write concern error to the results
+ if(_result.wtimeout != null || _result.jnote != null || _result.wnote != null) {
+ var error = _result.err || _result.errmsg || _result.wnote || _result.jnote || _result.wtimeout;
+ var code = _result.code || WRITE_CONCERN_ERROR;
+ // Push a write concern error to the list
+ _results.writeConcernErrors.push(new WriteConcernError({errmsg: error, code: code}));
+ }
+
  // We have an upserted field (might happen with a write concern error)
  if(_result.upserted) {
  _results.upserted.push({

lib/mongodb/db.js

@@ -1573,6 +1573,18 @@ Db.prototype.stats = function stats(options, callback) {
  this.command(commandObject, options, callback);
 }
 
+/**
+ * @ignore
+ */
+var bindToCurrentDomain = function(callback) {
+ var domain = process.domain;
+ if(domain == null || callback == null) {
+ return callback;
+ } else {
+ return domain.bind(callback);
+ }
+}
+
 /**
  * @ignore
  */
@@ -1599,6 +1611,7 @@ var __executeQueryCommand = function(self, db_command, options, callback) {
 
  // If we got a callback object
  if(typeof callback === 'function' && !onAll) {
+ callback = bindToCurrentDomain(callback);
  // Override connection if we passed in a specific connection
  var connection = specifiedConnection != null ? specifiedConnection : null;
 
@@ -1633,6 +1646,7 @@ var __executeQueryCommand = function(self, db_command, options, callback) {
  }
  });
  } else if(typeof callback === 'function' && onAll) {
+ callback = bindToCurrentDomain(callback);
  var connections = self.serverConfig.allRawConnections();
  var numberOfEntries = connections.length;
  // Go through all the connections
@@ -1800,6 +1814,7 @@ var __executeInsertCommand = function(self, db_command, options, callback) {
 
  // Ensure we have a valid connection
  if(typeof callback === 'function') {
+ callback = bindToCurrentDomain(callback);
  // Ensure we have a valid connection
  if(connection == null) {
  return callback(new Error("no open connections"));

test/tests/repl_set/batch_api_tests.js

@@ -44,7 +44,7 @@ exports['Should fail due to w:5 and wtimeout:1 with ordered batch api'] = functi
  // Execute the operations
  batch.execute({w:5, wtimeout:1}, function(err, result) {
  test.equal(2, result.nInserted);
- test.equal(0, result.nUpdated);
+ test.equal(0, result.nMatched);
  test.equal(0, result.nUpserted);
  test.equal(0, result.nRemoved);
  test.equal(0, result.nModified);
@@ -112,7 +112,7 @@ exports['Should fail due to w:5 and wtimeout:1 combined with duplicate key error
  // Execute the operations
  batch.execute({w:5, wtimeout:1}, function(err, result) {
  test.equal(1, result.nInserted);
- test.equal(0, result.nUpdated);
+ test.equal(0, result.nMatched);
  test.equal(1, result.nUpserted);
  test.equal(0, result.nRemoved);
  test.equal(0, result.nModified);
@@ -192,7 +192,7 @@ exports['Should fail due to w:5 and wtimeout:1 with unordered batch api'] = func
  // Execute the operations
  batch.execute({w:5, wtimeout:1}, function(err, result) {
  test.equal(2, result.nInserted);
- test.equal(0, result.nUpdated);
+ test.equal(0, result.nMatched);
  test.equal(1, result.nUpserted);
  test.equal(0, result.nRemoved);
  test.equal(0, result.nModified);
@@ -259,8 +259,11 @@ exports['Should fail due to w:5 and wtimeout:1 combined with duplicate key error
 
  // Execute the operations
  batch.execute({w:5, wtimeout:1}, function(err, result) {
+ console.log("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++")
+ console.dir(result.getRawResponse())
+
  test.equal(1, result.nInserted);
- test.equal(0, result.nUpdated);
+ test.equal(0, result.nMatched);
  test.equal(1, result.nUpserted);
  test.equal(0, result.nRemoved);
  test.equal(0, result.nModified);