Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8A2F8200B2F for ; Sat, 18 Jun 2016 18:55:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 870A1160A18; Sat, 18 Jun 2016 16:55:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CD706160A63 for ; Sat, 18 Jun 2016 18:55:10 +0200 (CEST) Received: (qmail 6968 invoked by uid 500); 18 Jun 2016 16:54:07 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 6706 invoked by uid 99); 18 Jun 2016 16:54:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Jun 2016 16:54:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 096D4E9438; Sat, 18 Jun 2016 16:54:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Sat, 18 Jun 2016 16:54:10 -0000 Message-Id: In-Reply-To: <9d322583f8204c579c9a6dd7ef7323f8@git.apache.org> References: <9d322583f8204c579c9a6dd7ef7323f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/18] hadoop git commit: YARN-5223. Container line in yarn logs output for a live application should include the hostname for the container. Contributed by Xuan Gong. archived-at: Sat, 18 Jun 2016 16:55:11 -0000 YARN-5223. Container line in yarn logs output for a live application should include the hostname for the container. Contributed by Xuan Gong. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/553df05b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/553df05b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/553df05b Branch: refs/heads/HDFS-1312 Commit: 553df05b06c61291faf29950288f2854ea26657e Parents: b3332b7 Author: Varun Vasudev Authored: Wed Jun 15 12:42:44 2016 +0530 Committer: Anu Engineer Committed: Sat Jun 18 00:05:02 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java | 3 ++- .../java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java | 2 ++ .../org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/553df05b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index c909402..ebd5428 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -393,7 +393,8 @@ public class LogsCLI extends Configured implements Tool { newOptions.setLogTypes(matchedFiles); Client webServiceClient = Client.create(); - String containerString = "\n\nContainer: " + containerIdStr; + String containerString = "\n\nContainer: " + containerIdStr + " on " + + nodeId; out.println(containerString); out.println(StringUtils.repeat("=", containerString.length())); http://git-wip-us.apache.org/repos/asf/hadoop/blob/553df05b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java index db40b50..10047e3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java @@ -463,6 +463,8 @@ public class TestLogsCLI { "Hello container_0_0001_01_000003 in syslog!")); assertTrue(sysOutStream.toString().contains( "Hello container_0_0001_01_000003 in stdout!")); + assertTrue(sysOutStream.toString().contains( + containerId3 + " on " + LogAggregationUtils.getNodeString(nodeId))); sysOutStream.reset(); fs.delete(new Path(remoteLogRootDir), true); http://git-wip-us.apache.org/repos/asf/hadoop/blob/553df05b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java index 26b2b01..e2e3b34 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java @@ -153,7 +153,8 @@ public class LogCLIHelpers implements Configurable { AggregatedLogFormat.LogReader reader = null; PrintStream out = createPrintStream(localDir, fileName, containerId); try { - String containerString = "\n\nContainer: " + containerId; + String containerString = "\n\nContainer: " + containerId + " on " + + thisNodeFile.getPath().getName(); out.println(containerString); out.println(StringUtils.repeat("=", containerString.length())); reader = @@ -220,7 +221,7 @@ public class LogCLIHelpers implements Configurable { thisNodeFile.getPath()); out = createPrintStream(localDir, thisNodeFile.getPath().getName(), containerId); - out.println(containerId); + out.println(containerId + " on " + thisNodeFile.getPath().getName()); out.println(StringUtils.repeat("=", containerId.length())); if (logType == null || logType.isEmpty()) { if (dumpAContainerLogs(containerId, reader, out, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org