You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gi...@apache.org on 2018/09/07 21:19:26 UTC
hadoop git commit: HADOOP-15731. TestDistributedShell fails on
Windows. Contributed by Botong Huang.
Repository: hadoop
Updated Branches:
refs/heads/trunk ca3adf588 -> 16333782c
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/16333782
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16333782
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16333782
Branch: refs/heads/trunk
Commit: 16333782c17d6c459019cf14682e5feee9968181
Parents: ca3adf5
Author: Giovanni Matteo Fumarola <gi...@apache.org>
Authored: Fri Sep 7 14:19:10 2018 -0700
Committer: Giovanni Matteo Fumarola <gi...@apache.org>
Committed: Fri Sep 7 14:19:10 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/16333782/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 c8a71b3..9da9288 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
@@ -854,7 +854,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/16333782/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 c7e1cf1..49d8f3d 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
@@ -776,6 +776,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 = {
@@ -784,7 +790,7 @@ public class TestDistributedShell {
"--num_containers",
"1",
"--shell_command",
- "sleep 8",
+ getSleepCommand(8),
"--master_memory",
"512",
"--container_memory",
@@ -819,7 +825,7 @@ public class TestDistributedShell {
"--num_containers",
"1",
"--shell_command",
- "sleep 8",
+ getSleepCommand(8),
"--master_memory",
"512",
"--container_memory",
@@ -857,7 +863,7 @@ public class TestDistributedShell {
"--num_containers",
"1",
"--shell_command",
- "sleep 8",
+ getSleepCommand(8),
"--master_memory",
"512",
"--container_memory",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org