hadoop git commit: HADOOP-15731. TestDistributedShell fails on Windows. Contributed by Botong Huang.

2018-09-07 Thread gifuma 
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 
Authored: Fri Sep 7 14:19:10 2018 -0700
Committer: Giovanni Matteo Fumarola 
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:

hadoop git commit: HADOOP-15731. TestDistributedShell fails on Windows. Contributed by Botong Huang.

2018-09-07 Thread gifuma 
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 a400ed3aa -> 7fed1a07a


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/7fed1a07
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7fed1a07
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7fed1a07

Branch: refs/heads/branch-3.1
Commit: 7fed1a07ab892935728ec2123f500ccbf3806b9a
Parents: a400ed3
Author: Giovanni Matteo Fumarola 
Authored: Fri Sep 7 14:19:10 2018 -0700
Committer: Giovanni Matteo Fumarola 
Committed: Fri Sep 7 16:37:03 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/7fed1a07/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 976e6a3..1ba1860 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/7fed1a07/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:

hadoop git commit: HADOOP-15731. TestDistributedShell fails on Windows. Contributed by Botong Huang.

2018-09-07 Thread gifuma 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 5c3c9431c -> d9d74cd79


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/d9d74cd7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9d74cd7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9d74cd7

Branch: refs/heads/branch-2.9
Commit: d9d74cd7931d7fe777e177b880c21251be70e8e3
Parents: 5c3c943
Author: Giovanni Matteo Fumarola 
Authored: Fri Sep 7 14:19:10 2018 -0700
Committer: Giovanni Matteo Fumarola 
Committed: Fri Sep 7 14:21:21 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/d9d74cd7/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 eedb501..50f5bdf 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
@@ -690,7 +690,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/d9d74cd7/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 af7d21e..f42758d 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
@@ -748,6 +748,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 = {
@@ -756,7 +762,7 @@ public class TestDistributedShell {
 "--num_containers",
 "1",
 "--shell_command",
-"sleep 8",
+getSleepCommand(8),
 "--master_memory",
 "512",
 "--container_memory",
@@ -791,7 +797,7 @@ public class TestDistributedShell {
 "--num_containers",
 "1",
 "--shell_command",
-"sleep 8",
+getSleepCommand(8),
 "--master_memory",
 "512",
 "--container_memory",
@@ -829,7 +835,7 @@ public class TestDistributedShell {
 "--num_containers",
 "1",
 "--shell_command",
-"sleep 8",
+getSleepCommand(8),
 "--master_memory",
 "512",
 "--container_memory",


-
To unsubscribe, e-mail:

hadoop git commit: HADOOP-15731. TestDistributedShell fails on Windows. Contributed by Botong Huang.

2018-09-07 Thread gifuma 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 1b12925d6 -> 6c8fc8f78


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/6c8fc8f7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c8fc8f7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c8fc8f7

Branch: refs/heads/branch-2
Commit: 6c8fc8f786287cd066de01684c909d1a0eb1cd75
Parents: 1b12925
Author: Giovanni Matteo Fumarola 
Authored: Fri Sep 7 14:19:10 2018 -0700
Committer: Giovanni Matteo Fumarola 
Committed: Fri Sep 7 14:20:28 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/6c8fc8f7/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 eedb501..50f5bdf 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
@@ -690,7 +690,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/6c8fc8f7/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 70ec4db..8af6625 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
@@ -757,6 +757,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 = {
@@ -765,7 +771,7 @@ public class TestDistributedShell {
 "--num_containers",
 "1",
 "--shell_command",
-"sleep 8",
+getSleepCommand(8),
 "--master_memory",
 "512",
 "--container_memory",
@@ -800,7 +806,7 @@ public class TestDistributedShell {
 "--num_containers",
 "1",
 "--shell_command",
-"sleep 8",
+getSleepCommand(8),
 "--master_memory",
 "512",
 "--container_memory",
@@ -838,7 +844,7 @@ public class TestDistributedShell {
 "--num_containers",
 "1",
 "--shell_command",
-"sleep 8",
+getSleepCommand(8),
 "--master_memory",
 "512",
 "--container_memory",


-
To unsubscribe, e-mail:

hadoop git commit: HADOOP-15731. TestDistributedShell fails on Windows. Contributed by Botong Huang.

2018-09-07 Thread gifuma 
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 
Authored: Fri Sep 7 14:19:10 2018 -0700
Committer: Giovanni Matteo Fumarola 
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: