From b2a9e08fade4167d42e465114928b320e265993b Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Tue, 22 Apr 2014 12:24:37 -0700 Subject: [PATCH] when starting 1.x and master versions of ES for testing, start with the node.bench flag set to true. --- grunt/config/run.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/grunt/config/run.js b/grunt/config/run.js index b199e93b1..d0012ed5b 100644 --- a/grunt/config/run.js +++ b/grunt/config/run.js @@ -8,7 +8,7 @@ var esOpts = [ '-D es.discovery.zen.ping.multicast.enabled=false', '-D es.discovery.zen.ping_timeout=1', '-D es.logger.level=ERROR' -].join(' '); +]; var utils = require('../utils'); @@ -49,11 +49,20 @@ utils.branches.forEach(function (branch) { exec: './scripts/es.sh install ' + branch, }; + var args = esOpts.slice(0); + + switch (branch) { + case '0.90': + args.push('-f'); + break; + case 'master': + case '1.x': + args.push('-Des.node.bench=true'); + break; + } + config['es_' + branch] = { - exec: - './.snapshots/' + branch + '_nightly/bin/elasticsearch ' + - (branch === '0.90' ? '-f ' : '') + - esOpts, + exec: './.snapshots/' + branch + '_nightly/bin/elasticsearch ' + args.join(' '), options: { wait: false, quiet: true