Merged

Author: christkv

lib/db.js

@@ -1072,9 +1072,10 @@ var createIndex = function(self, name, fieldOrSpec, options, callback) {
     // 67 = 'CannotCreateIndex' (malformed index options)
     // 85 = 'IndexOptionsConflict' (index already exists with different options)
     // 11000 = 'DuplicateKey' (couldn't build unique index because of dupes)
+    // 11600 = 'InterruptedAtShutdown' (interrupted at shutdown)
     // These errors mean that the server recognized `createIndex` as a command
     // and so we don't need to fallback to an insert.
-    if(err.code === 67 || err.code == 11000 || err.code === 85) {
+    if(err.code === 67 || err.code == 11000 || err.code === 85 || err.code == 11600) {
       return handleCallback(callback, err, result);
     }
 

test/functional/apm_tests.js

@@ -1025,3 +1025,30 @@ exports['Ensure killcursor commands are sent on 3.0 or earlier when APM is enabl
     });
   }
 }
+
+exports['Ensure killcursor commands are sent on 3.0 or earlier when APM is enabled'] = {
+  metadata: { requires: { topology: ['single', 'replicaset'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var started = [];
+    var succeeded = [];
+    var failed = [];
+    var callbackTriggered = false;
+
+    var listener = require('../..').instrument(function(err, instrumentations) {});
+    var db = configuration.newDbInstance({w:1}, {poolSize:1, auto_reconnect:false});
+    db.open(function(err, db) {
+      var collection = db.collection('apm_killcursor_tests_1');
+
+      // make sure collection has records (more than 2)
+      collection.insert({}, function(err, r) {
+        test.equal(null, err);
+
+        listener.uninstrument();
+        db.close();
+        test.done();
+      });
+    });
+  }
+}

test/functional/replset_failover_tests.js

@@ -591,3 +591,61 @@ exports['Should get proper error when strict is set and only a secondary is avai
     });
   }
 }
+
+// /**
+//  * @ignore
+//  */
+// exports['Should correctly re-execute createIndex against primary after step-down'] = {
+//   metadata: { requires: { topology: 'replicaset' } },
+
+//   test: function(configuration, test) {
+//     // The state
+//     var manager = configuration.manager;
+
+//     var db = configuration.newDbInstance({w:1}, {poolSize:1});
+//     db.open(function(err, db) {
+//       db.once('fullsetup', function() {
+//         // Wait for close event due to primary stepdown
+//         db.serverConfig.on('joined', function(t, d, s) {
+//           if(t == 'primary') console.log("primary joined " + s.name)
+//         });
+
+//         db.serverConfig.on('left', function(t, s) {
+//           if(t == 'primary') {
+//           }
+//         });
+
+//         manager.primary().then(function(primary) {
+//           primary.stop(9).then(function() {
+//           });
+
+//             // // Execute createIndex
+//             // db.collection('t').createIndex({'accessControl.get': 1}, {background: true}, function(err, r) {
+//             //   console.dir(err)
+//             //   console.dir(r)
+
+//             //   test.ok(err != null);
+//             //   test.ok(err.message.indexOf('key accessControl.get must not contain') == -1);
+
+//             //   db.close();
+//             //   test.done();
+//             // });
+
+//           setTimeout(function() {
+//             // Execute createIndex
+//             db.collection('t').createIndex({'accessControl.get': 1}, {background: true}, function(err, r) {
+//               console.dir(err)
+//               console.dir(r)
+
+//               test.ok(err != null);
+//               test.ok(err.message.indexOf('key accessControl.get must not contain') == -1);
+
+//               db.close();
+//               test.done();
+//             });
+//           }, 100);
+//         });
+//       });
+//     });
+//   }
+// }