From 3ab857922178a1c1769c8b04ed96430c4fef7173 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Thu, 28 May 2015 09:56:31 +0200 Subject: [PATCH] The planner needs to forward the valgrindHosts variable. --- js/server/modules/org/arangodb/cluster/planner.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/js/server/modules/org/arangodb/cluster/planner.js b/js/server/modules/org/arangodb/cluster/planner.js index 7a411bc601..a7a5d36c53 100644 --- a/js/server/modules/org/arangodb/cluster/planner.js +++ b/js/server/modules/org/arangodb/cluster/planner.js @@ -62,7 +62,8 @@ var PlannerLocalDefaults = { "valgrind" : "", "valgrindopts" : [], "valgrindXmlFileBase" : "", - "valgrindTestname" : "" + "valgrindTestname" : "", + "valgrindHosts" : "" }; // Some helpers using underscore: @@ -399,6 +400,8 @@ function checkDispatcherIps (config) { /// - *valgrindopts*: commandline options to the valgrind process /// - *valgrindXmlFileBase*: pattern for logfiles /// - *valgrindTestname*: name of test to add to the logfiles +/// - *valgrindHosts*: which host classes should run in valgrind? +/// Coordinator / DBServer /// /// All these values have default values. Here is the current set of /// default values: @@ -672,7 +675,8 @@ Planner.prototype.makePlan = function() { "valgrind" : config.valgrind, "valgrindopts" : config.valgrindopts, "valgrindXmlFileBase" : config.valgrindXmlFileBase, - "valgrindTestname" : config.valgrindXmlFileBase + "valgrindTestname" : config.valgrindXmlFileBase, + "valgrindHosts" : config.valgrindHosts }; for (j = 0; j < i; j++) { ep = dispatchers[agents[j].dispatcher].endpoint; @@ -703,7 +707,8 @@ Planner.prototype.makePlan = function() { "valgrind" : config.valgrind, "valgrindopts" : config.valgrindopts, "valgrindXmlFileBase" : config.valgrindXmlFileBase, - "valgrindTestname" : config.valgrindTestname + "valgrindTestname" : config.valgrindTestname, + "valgrindHosts" : config.valgrindHosts } ); }