Repository: hadoop Updated Branches: refs/heads/branch-2.7 4fd2adbc5 -> 32a86f199
YARN-5550. TestYarnCLI#testGetContainers should format according to CONTAINER_PATTERN. Contributed by Jonathan Hung. (cherry picked from commit ed6ff5cd789cab621fbfb88c8e8de4f215cd2961) (cherry picked from commit 3ad4f0823c22b686120e8fa06ac52d705defcc61) (cherry picked from commit 765139e4dadff707411fc50c9a0799aef340d742) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/32a86f19 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/32a86f19 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/32a86f19 Branch: refs/heads/branch-2.7 Commit: 32a86f199cd8e7f32c264af55e3459e4b4751963 Parents: 4fd2adb Author: Zhe Zhang <[email protected]> Authored: Mon Aug 29 14:46:00 2016 -0700 Committer: Zhe Zhang <[email protected]> Committed: Mon Aug 29 14:52:09 2016 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/client/cli/ApplicationCLI.java | 9 +++-- .../hadoop/yarn/client/cli/TestYarnCLI.java | 39 ++++++-------------- 2 files changed, 17 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/32a86f19/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java index dd4a949..4a4221c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java @@ -62,14 +62,17 @@ public class ApplicationCLI extends YarnCLI { private static final String APPLICATION_ATTEMPTS_PATTERN = "%30s\t%20s\t%35s\t%35s" + System.getProperty("line.separator"); - private static final String CONTAINER_PATTERN = - "%30s\t%20s\t%20s\t%20s\t%20s\t%20s\t%35s" - + System.getProperty("line.separator"); private static final String APP_TYPE_CMD = "appTypes"; private static final String APP_STATE_CMD = "appStates"; private static final String ALLSTATES_OPTION = "ALL"; private static final String QUEUE_CMD = "queue"; + + @VisibleForTesting + protected static final String CONTAINER_PATTERN = + "%30s\t%20s\t%20s\t%20s\t%20s\t%20s\t%35s" + + System.getProperty("line.separator"); + public static final String APPLICATION = "application"; public static final String APPLICATION_ATTEMPT = "applicationattempt"; public static final String CONTAINER = "container"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/32a86f19/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java index 4b60c52..098569d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java @@ -286,34 +286,17 @@ public class TestYarnCLI { ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintWriter pw = new PrintWriter(baos); pw.println("Total number of containers :3"); - pw.print(" Container-Id"); - pw.print("\t Start Time"); - pw.print("\t Finish Time"); - pw.print("\t State"); - pw.print("\t Host"); - pw.print("\t Node Http Address"); - pw.println("\t LOG-URL"); - pw.print(" container_1234_0005_01_000001"); - pw.print("\t"+dateFormat.format(new Date(time1))); - pw.print("\t"+dateFormat.format(new Date(time2))); - pw.print("\t COMPLETE"); - pw.print("\t host:1234"); - pw.print("\t http://host:2345";); - pw.println("\t logURL"); - pw.print(" container_1234_0005_01_000002"); - pw.print("\t"+dateFormat.format(new Date(time1))); - pw.print("\t"+dateFormat.format(new Date(time2))); - pw.print("\t COMPLETE"); - pw.print("\t host:1234"); - pw.print("\t http://host:2345";); - pw.println("\t logURL"); - pw.print(" container_1234_0005_01_000003"); - pw.print("\t"+dateFormat.format(new Date(time1))); - pw.print("\t N/A"); - pw.print("\t RUNNING"); - pw.print("\t host:1234"); - pw.print("\t http://host:2345";); - pw.println("\t "); + pw.printf(ApplicationCLI.CONTAINER_PATTERN, "Container-Id", "Start Time", + "Finish Time", "State", "Host", "Node Http Address", "LOG-URL"); + pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000001", + dateFormat.format(new Date(time1)), dateFormat.format(new Date(time2)), + "COMPLETE", "host:1234", "http://host:2345";, "logURL"); + pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000002", + dateFormat.format(new Date(time1)), dateFormat.format(new Date(time2)), + "COMPLETE", "host:1234", "http://host:2345";, "logURL"); + pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000003", + dateFormat.format(new Date(time1)), "N/A", "RUNNING", "host:1234", + "http://host:2345";, ""); pw.close(); String appReportStr = baos.toString("UTF-8"); Log.info("ExpectedOutput"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
