Merge pull request #206 from 10gen/INT-527_maxTimeMS

🎉 INT-527: use maxTimeMS for queries against prod servers to avoid excessive scans

Author: Waley Chen

package.json

@@ -78,8 +78,9 @@
     "mongodb-connection-model": "^3.0.6",
     "mongodb-instance-model": "^1.0.2",
     "mongodb-ns": "^1.0.0",
+    "ms": "^0.7.1",
     "node-notifier": "^4.3.1",
-    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.5/scout-server-0.4.5.tar.gz"
+    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.6/scout-server-0.4.6.tar.gz"
   },
   "devDependencies": {
     "ampersand-app": "^1.0.4",

src/models/query-options.js

@@ -1,3 +1,4 @@
+var ms = require('ms');
 var Model = require('ampersand-model');
 var EJSON = require('mongodb-extended-json');
 var Query = require('mongodb-language-model').Query;
@@ -8,6 +9,7 @@ var DEFAULT_SORT = {
 };
 var DEFAULT_SIZE = 100;
 var DEFAULT_SKIP = 0;
+var DEFAULT_MAX_TIME_MS = ms('10 seconds');
 
 var getDefaultQuery = function() {
   return new Query({}, {
@@ -39,6 +41,10 @@ module.exports = Model.extend({
     skip: {
       type: 'number',
       default: DEFAULT_SKIP
+    },
+    maxTimeMS: {
+      type: 'number',
+      default: DEFAULT_MAX_TIME_MS
     }
   },
   derived: {
@@ -60,7 +66,8 @@ module.exports = Model.extend({
       query: getDefaultQuery(),
       sort: DEFAULT_SORT,
       size: DEFAULT_SIZE,
-      skip: DEFAULT_SKIP
+      skip: DEFAULT_SKIP,
+      maxTimeMS: DEFAULT_MAX_TIME_MS
     });
     this.trigger('reset', this);
   }