Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-24801] Expand JVM args
  • Loading branch information
vjuranek committed Sep 22, 2014
1 parent 208edd5 commit 6238485
Showing 1 changed file with 7 additions and 5 deletions.
Expand Up @@ -104,7 +104,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
build.addAction(masterAction);
String[] masterCmdLine = scriptSource.getMasterCmdLine(nodes.getMaster().getHostname(), rgMasterScript,
scenarioSource.getTmpScenarioPath(build), Integer.toString(nodes.getSlaveCount()),
buildJvmOptions(nodes.getMaster()));
buildJvmOptions(build, nodes.getMaster()));
ProcStarter masterProcStarter = buildProcStarter(build, launcher, masterCmdLine, masterAction.getLogFile());
nodeRunners.add(new NodeRunner(masterProcStarter, masterAction));

Expand All @@ -115,7 +115,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
RadarGunNodeAction slaveAction = new RadarGunNodeAction(build, slave.getHostname());
build.addAction(slaveAction);
String[] slaveCmdLine = scriptSource.getSlaveCmdLine(slave.getHostname(), rgSlaveScript, String.valueOf(i),
buildJvmOptions(slave));
buildJvmOptions(build, slave));
ProcStarter slaveProcStarter = buildProcStarter(build, launcher, slaveCmdLine, slaveAction.getLogFile());
nodeRunners.add(new NodeRunner(slaveProcStarter, slaveAction));
}
Expand Down Expand Up @@ -158,9 +158,11 @@ private boolean runRGNodes(List<NodeRunner> nodeRunners) throws AbortException {
return isSuccess;
}

private String buildJvmOptions(Node node) {
return node.getJvmOptions() == null ? defaultJvmArgs : String.format("%s %s", defaultJvmArgs,
node.getJvmOptions());
private String buildJvmOptions(AbstractBuild<?,?> build, Node node) {
String nodeJvmOpts = Resolver.buildVar(build, node.getJvmOptions());
String defaultOptsRes = Resolver.buildVar(build, defaultJvmArgs);
return nodeJvmOpts == null ? defaultOptsRes : String.format("%s %s", defaultOptsRes,
nodeJvmOpts);
}

private ProcStarter buildProcStarter(AbstractBuild<?, ?> build, Launcher launcher, String[] cmdLine, File log)
Expand Down

0 comments on commit 6238485

Please sign in to comment.