Repository: hadoop Updated Branches: refs/heads/branch-3.1 9f0cd2ade -> e2e0fc26a
YARN-8535. Fix DistributedShell unit tests. Contributed by Abhishek Modi. (cherry picked from commit eed8415dc18fa7415ebd105350bd0532b3b1b6bb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e2e0fc26 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e2e0fc26 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e2e0fc26 Branch: refs/heads/branch-3.1 Commit: e2e0fc26a26f070af9d98eb4aa15c6bede4d8a05 Parents: 9f0cd2a Author: bibinchundatt <[email protected]> Authored: Sun Sep 2 13:35:52 2018 +0530 Committer: bibinchundatt <[email protected]> Committed: Sun Sep 2 13:37:38 2018 +0530 ---------------------------------------------------------------------- .../yarn/applications/distributedshell/ApplicationMaster.java | 2 +- .../yarn/applications/distributedshell/TestDistributedShell.java | 1 + .../test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2e0fc26/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.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/ApplicationMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java index 76fa38f..ecf07b1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java @@ -944,7 +944,7 @@ public class ApplicationMaster { // When the application completes, it should send a finish application // signal to the RM - LOG.info("Application completed. Signalling finish to RM"); + LOG.info("Application completed. Signalling finished to RM"); FinalApplicationStatus appStatus; boolean success = true; http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2e0fc26/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 3a98a22..c7e1cf1 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 @@ -624,6 +624,7 @@ public class TestDistributedShell { String entityfileName) { String outputDirPathForEntity = basePath + File.separator + entityType + File.separator; + LOG.info(outputDirPathForEntity); File outputDirForEntity = new File(outputDirPathForEntity); Assert.assertTrue(outputDirForEntity.isDirectory()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2e0fc26/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java index 0395138..fa69f18 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java @@ -577,7 +577,9 @@ public class MiniYARNCluster extends CompositeService { config.set(YarnConfiguration.NM_LOCALIZER_ADDRESS, MiniYARNCluster.getHostname() + ":0"); config.set(YarnConfiguration.NM_COLLECTOR_SERVICE_ADDRESS, - MiniYARNCluster.getHostname() + ":0"); + MiniYARNCluster.getHostname() + ":" + + ServerSocketUtil.getPort( + YarnConfiguration.DEFAULT_NM_COLLECTOR_SERVICE_PORT, 10)); WebAppUtils .setNMWebAppHostNameAndPort(config, MiniYARNCluster.getHostname(), 0); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
