You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ka...@apache.org on 2018/07/20 19:06:01 UTC
[incubator-heron] branch master updated: fixing download issue in
Nomad scheduler (#2969)
This is an automated email from the ASF dual-hosted git repository.
karthikz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new c3968d5 fixing download issue in Nomad scheduler (#2969)
c3968d5 is described below
commit c3968d55c5e6c5db9e098f673767e54f976ad3e1
Author: Boyang Jerry Peng <je...@gmail.com>
AuthorDate: Fri Jul 20 12:05:59 2018 -0700
fixing download issue in Nomad scheduler (#2969)
* fixing download issue in Nomad scheduler
* fix formatting
---
.../org/apache/heron/scheduler/nomad/NomadScheduler.java | 14 +++++++++-----
.../apache/heron/scheduler/nomad/NomadSchedulerTest.java | 6 +++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadScheduler.java b/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadScheduler.java
index bc2da01..7f7e1c5 100644
--- a/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadScheduler.java
+++ b/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadScheduler.java
@@ -341,7 +341,8 @@ public class NomadScheduler implements IScheduler {
// get complete heron executor command
String executorCmd = executorBinary + " " + String.join(" ", executorArgs);
// get heron_downloader command for downloading topology package
- String topologyDownloadCmd = getFetchCommand(this.clusterConfig, this.runtimeConfig);
+ String topologyDownloadCmd = getFetchCommand(this.clusterConfig,
+ this.clusterConfig, this.runtimeConfig);
task.setName(taskName);
// use nomad driver
@@ -382,7 +383,8 @@ public class NomadScheduler implements IScheduler {
// get complete heron executor command
String executorCmd = executorBinary + " " + String.join(" ", executorArgs);
// get heron_downloader command for downloading topology package
- String topologyDownloadCmd = getFetchCommand(this.clusterConfig, this.runtimeConfig);
+ String topologyDownloadCmd = getFetchCommand(this.localConfig,
+ this.clusterConfig, this.runtimeConfig);
// read nomad heron executor start up script from file
String heronNomadScript = getHeronNomadScript(this.localConfig);
@@ -549,9 +551,11 @@ public class NomadScheduler implements IScheduler {
/**
* Get the command that will be used to retrieve the topology JAR
*/
- static String getFetchCommand(Config config, Config runtime) {
- return String.format("%s %s .", Context.downloaderBinary(config),
- Runtime.topologyPackageUri(runtime).toString());
+ static String getFetchCommand(Config localConfig, Config clusterConfig, Config runtime) {
+ return String.format("%s -u %s -f . -m local -p %s -d %s",
+ Context.downloaderBinary(clusterConfig),
+ Runtime.topologyPackageUri(runtime).toString(), Context.heronConf(localConfig),
+ Context.heronHome(clusterConfig));
}
static int longToInt(long val) {
diff --git a/heron/schedulers/tests/java/org/apache/heron/scheduler/nomad/NomadSchedulerTest.java b/heron/schedulers/tests/java/org/apache/heron/scheduler/nomad/NomadSchedulerTest.java
index c545616..276d6ff 100644
--- a/heron/schedulers/tests/java/org/apache/heron/scheduler/nomad/NomadSchedulerTest.java
+++ b/heron/schedulers/tests/java/org/apache/heron/scheduler/nomad/NomadSchedulerTest.java
@@ -324,7 +324,7 @@ public class NomadSchedulerTest {
.thenReturn(EXECUTOR_CMD_ARGS);
PowerMockito.mockStatic(NomadScheduler.class);
- PowerMockito.when(NomadScheduler.getFetchCommand(Mockito.any(), Mockito.any()))
+ PowerMockito.when(NomadScheduler.getFetchCommand(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(TOPOLOGY_DOWNLOAD_CMD);
PowerMockito.when(NomadScheduler.getHeronNomadScript(this.mockConfig))
.thenReturn(HERON_NOMAD_SCRIPT);
@@ -405,7 +405,7 @@ public class NomadSchedulerTest {
.thenReturn(EXECUTOR_CMD_ARGS);
PowerMockito.mockStatic(NomadScheduler.class);
- PowerMockito.when(NomadScheduler.getFetchCommand(Mockito.any(), Mockito.any()))
+ PowerMockito.when(NomadScheduler.getFetchCommand(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(TOPOLOGY_DOWNLOAD_CMD);
PowerMockito.when(NomadScheduler.getHeronNomadScript(this.mockConfig))
.thenReturn(HERON_NOMAD_SCRIPT);
@@ -485,7 +485,7 @@ public class NomadSchedulerTest {
.thenReturn(EXECUTOR_CMD_ARGS);
PowerMockito.mockStatic(NomadScheduler.class);
- PowerMockito.when(NomadScheduler.getFetchCommand(Mockito.any(), Mockito.any()))
+ PowerMockito.when(NomadScheduler.getFetchCommand(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(TOPOLOGY_DOWNLOAD_CMD);
PowerMockito.when(NomadScheduler.getHeronNomadScript(this.mockConfig))
.thenReturn(HERON_NOMAD_SCRIPT);