Repository: hadoop Updated Branches: refs/heads/branch-3.0 a9392bdb1 -> 37032a3ac
HADOOP-15731. TestDistributedShell fails on Windows. Contributed by Botong Huang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/37032a3a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/37032a3a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/37032a3a Branch: refs/heads/branch-3.0 Commit: 37032a3acadd430a7aeebe51ded91f7c546bc766 Parents: a9392bd Author: Giovanni Matteo Fumarola <gif...@apache.org> Authored: Fri Sep 7 14:19:10 2018 -0700 Committer: Giovanni Matteo Fumarola <gif...@apache.org> Committed: Fri Sep 7 16:37:15 2018 -0700 ---------------------------------------------------------------------- .../yarn/applications/distributedshell/Client.java | 4 +++- .../distributedshell/TestDistributedShell.java | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/37032a3a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java index b429948..fd04997 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java @@ -715,7 +715,9 @@ public class Client { // Set java executable command LOG.info("Setting up app master command"); - vargs.add(Environment.JAVA_HOME.$$() + "/bin/java"); + // Need extra quote here because JAVA_HOME might contain space on Windows, + // e.g. C:/Program Files/Java... + vargs.add("\"" + Environment.JAVA_HOME.$$() + "/bin/java\""); // Set Xmx based on am memory size vargs.add("-Xmx" + amMemory + "m"); // Set class name http://git-wip-us.apache.org/repos/asf/hadoop/blob/37032a3a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java index 8eadf5d..f109d83 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java @@ -758,6 +758,12 @@ public class TestDistributedShell { } + private String getSleepCommand(int sec) { + // Windows doesn't have a sleep command, ping -n does the trick + return Shell.WINDOWS ? "ping -n " + (sec + 1) + " 127.0.0.1 >nul" + : "sleep " + sec; + } + @Test public void testDSRestartWithPreviousRunningContainers() throws Exception { String[] args = { @@ -766,7 +772,7 @@ public class TestDistributedShell { "--num_containers", "1", "--shell_command", - "sleep 8", + getSleepCommand(8), "--master_memory", "512", "--container_memory", @@ -801,7 +807,7 @@ public class TestDistributedShell { "--num_containers", "1", "--shell_command", - "sleep 8", + getSleepCommand(8), "--master_memory", "512", "--container_memory", @@ -839,7 +845,7 @@ public class TestDistributedShell { "--num_containers", "1", "--shell_command", - "sleep 8", + getSleepCommand(8), "--master_memory", "512", "--container_memory", --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
