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 vv...@apache.org on 2016/06/15 07:16:10 UTC
[1/4] hadoop git commit: YARN-5122. "yarn logs" for running
containers should print an explicit footer saying that the log may be
incomplete. Contributed by Jian He.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 6ffb55752 -> 75235149a
refs/heads/trunk 098ae11e3 -> 25064fb2f
YARN-5122. "yarn logs" for running containers should print an explicit footer saying that the log may be incomplete. Contributed by Jian He.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d6284428
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d6284428
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d6284428
Branch: refs/heads/trunk
Commit: d6284428e8bd09a06cf18ff81a7064d744ef47d0
Parents: 098ae11
Author: Varun Vasudev <vv...@apache.org>
Authored: Wed Jun 15 12:35:17 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Wed Jun 15 12:35:17 2016 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6284428/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 4fdb57b..c909402 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
@@ -412,7 +412,9 @@ public class LogsCLI extends Configured implements Tool {
.queryParam("size", Long.toString(request.getBytes()))
.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
out.println(response.getEntity(String.class));
- out.println("End of LogType:" + logFile);
+ out.println("End of LogType:" + logFile + ". This log file belongs"
+ + " to a running container (" + containerIdStr + ") and so may"
+ + " not be complete.");
out.flush();
} catch (ClientHandlerException | UniformInterfaceException ex) {
System.err.println("Can not find the log file:" + logFile
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/4] hadoop git commit: YARN-5122. "yarn logs" for running
containers should print an explicit footer saying that the log may be
incomplete. Contributed by Jian He.
Posted by vv...@apache.org.
YARN-5122. "yarn logs" for running containers should print an explicit footer saying that the log may be incomplete. Contributed by Jian He.
(cherry picked from commit d6284428e8bd09a06cf18ff81a7064d744ef47d0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5bd39d2f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5bd39d2f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5bd39d2f
Branch: refs/heads/branch-2
Commit: 5bd39d2f3c00f1bbdf84ef86e8eb05876cc05a21
Parents: 6ffb557
Author: Varun Vasudev <vv...@apache.org>
Authored: Wed Jun 15 12:35:17 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Wed Jun 15 12:37:51 2016 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5bd39d2f/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 4fdb57b..c909402 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
@@ -412,7 +412,9 @@ public class LogsCLI extends Configured implements Tool {
.queryParam("size", Long.toString(request.getBytes()))
.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
out.println(response.getEntity(String.class));
- out.println("End of LogType:" + logFile);
+ out.println("End of LogType:" + logFile + ". This log file belongs"
+ + " to a running container (" + containerIdStr + ") and so may"
+ + " not be complete.");
out.flush();
} catch (ClientHandlerException | UniformInterfaceException ex) {
System.err.println("Can not find the log file:" + logFile
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/4] 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.
Posted by vv...@apache.org.
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/25064fb2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/25064fb2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/25064fb2
Branch: refs/heads/trunk
Commit: 25064fb2fb79751cedbb8019900d811e07549ecf
Parents: d628442
Author: Varun Vasudev <vv...@apache.org>
Authored: Wed Jun 15 12:42:44 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Wed Jun 15 12:42:44 2016 +0530
----------------------------------------------------------------------
.../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/25064fb2/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/25064fb2/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/25064fb2/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
[4/4] 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.
Posted by vv...@apache.org.
YARN-5223. Container line in yarn logs output for a live application should include the hostname for the container. Contributed by Xuan Gong.
(cherry picked from commit 25064fb2fb79751cedbb8019900d811e07549ecf)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/75235149
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/75235149
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/75235149
Branch: refs/heads/branch-2
Commit: 75235149afbd4e1bc51c2d553763a35d68e94d01
Parents: 5bd39d2
Author: Varun Vasudev <vv...@apache.org>
Authored: Wed Jun 15 12:42:44 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Wed Jun 15 12:43:26 2016 +0530
----------------------------------------------------------------------
.../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/75235149/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/75235149/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/75235149/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