Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

The planner needs to forward the valgrindHosts variable.

This commit is contained in:
Willi Goesgens 2015-05-28 09:56:31 +02:00
parent 159533ab16
commit 3ab8579221
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/server/modules/org/arangodb/cluster/planner.js
View File

@ -62,7 +62,8 @@ var PlannerLocalDefaults = {
"valgrind" : "", "valgrind" : "",
"valgrindopts" : [], "valgrindopts" : [],
"valgrindXmlFileBase" : "", "valgrindXmlFileBase" : "",
"valgrindTestname" : "" "valgrindTestname" : "",
"valgrindHosts" : ""
}; };
// Some helpers using underscore: // Some helpers using underscore:
@ -399,6 +400,8 @@ function checkDispatcherIps (config) {
/// - *valgrindopts*: commandline options to the valgrind process /// - *valgrindopts*: commandline options to the valgrind process
/// - *valgrindXmlFileBase*: pattern for logfiles /// - *valgrindXmlFileBase*: pattern for logfiles
/// - *valgrindTestname*: name of test to add to the 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 /// All these values have default values. Here is the current set of
/// default values: /// default values:
@ -672,7 +675,8 @@ Planner.prototype.makePlan = function() {
"valgrind" : config.valgrind, "valgrind" : config.valgrind,
"valgrindopts" : config.valgrindopts, "valgrindopts" : config.valgrindopts,
"valgrindXmlFileBase" : config.valgrindXmlFileBase, "valgrindXmlFileBase" : config.valgrindXmlFileBase,
"valgrindTestname" : config.valgrindXmlFileBase "valgrindTestname" : config.valgrindXmlFileBase,
"valgrindHosts" : config.valgrindHosts
}; };
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
ep = dispatchers[agents[j].dispatcher].endpoint; ep = dispatchers[agents[j].dispatcher].endpoint;
@ -703,7 +707,8 @@ Planner.prototype.makePlan = function() {
"valgrind" : config.valgrind, "valgrind" : config.valgrind,
"valgrindopts" : config.valgrindopts, "valgrindopts" : config.valgrindopts,
"valgrindXmlFileBase" : config.valgrindXmlFileBase, "valgrindXmlFileBase" : config.valgrindXmlFileBase,
"valgrindTestname" : config.valgrindTestname "valgrindTestname" : config.valgrindTestname,
"valgrindHosts" : config.valgrindHosts
} ); } );
} }