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 xy...@apache.org on 2017/12/12 23:58:41 UTC
[06/50] hadoop git commit: YARN-7607. Remove the trailing duplicated
timestamp in container diagnostics message. Contributed by Weiwei Yang.
YARN-7607. Remove the trailing duplicated timestamp in container diagnostics message. Contributed by Weiwei Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e411dd66
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e411dd66
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e411dd66
Branch: refs/heads/HDFS-7240
Commit: e411dd6666041a4ea68ab34e734802271497ae6c
Parents: c2e8a5c
Author: Weiwei Yang <ww...@apache.org>
Authored: Thu Dec 7 17:29:40 2017 +0800
Committer: Weiwei Yang <ww...@apache.org>
Committed: Thu Dec 7 17:29:40 2017 +0800
----------------------------------------------------------------------
.../container/ContainerImpl.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e411dd66/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
index 901b013..f95c2a0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
@@ -1541,7 +1541,7 @@ public class ContainerImpl implements Container {
ContainerExitEvent exitEvent = (ContainerExitEvent) event;
container.exitCode = exitEvent.getExitCode();
if (exitEvent.getDiagnosticInfo() != null) {
- container.addDiagnostics(exitEvent.getDiagnosticInfo(), "\n");
+ container.addDiagnostics(exitEvent.getDiagnosticInfo() + "\n");
}
// TODO: Add containerWorkDir to the deletion service.
@@ -1578,7 +1578,7 @@ public class ContainerImpl implements Container {
container.addDiagnostics("Diagnostic message from attempt "
+ n + " : ", "\n");
}
- container.addDiagnostics(exitEvent.getDiagnosticInfo(), "\n");
+ container.addDiagnostics(exitEvent.getDiagnosticInfo() + "\n");
}
if (container.shouldRetry(container.exitCode)) {
@@ -1737,7 +1737,7 @@ public class ContainerImpl implements Container {
ContainerResourceFailedEvent rsrcFailedEvent =
(ContainerResourceFailedEvent) event;
- container.addDiagnostics(rsrcFailedEvent.getDiagnosticMessage(), "\n");
+ container.addDiagnostics(rsrcFailedEvent.getDiagnosticMessage() + "\n");
// Inform the localizer to decrement reference counts and cleanup
// resources.
@@ -1760,7 +1760,7 @@ public class ContainerImpl implements Container {
container.metrics.endInitingContainer();
ContainerKillEvent killEvent = (ContainerKillEvent) event;
container.exitCode = killEvent.getContainerExitStatus();
- container.addDiagnostics(killEvent.getDiagnostic(), "\n");
+ container.addDiagnostics(killEvent.getDiagnostic() + "\n");
container.addDiagnostics("Container is killed before being launched.\n");
}
}
@@ -1799,7 +1799,7 @@ public class ContainerImpl implements Container {
new ContainersLauncherEvent(container,
ContainersLauncherEventType.CLEANUP_CONTAINER));
ContainerKillEvent killEvent = (ContainerKillEvent) event;
- container.addDiagnostics(killEvent.getDiagnostic(), "\n");
+ container.addDiagnostics(killEvent.getDiagnostic() + "\n");
container.exitCode = killEvent.getContainerExitStatus();
}
}
@@ -1838,7 +1838,7 @@ public class ContainerImpl implements Container {
}
if (exitEvent.getDiagnosticInfo() != null) {
- container.addDiagnostics(exitEvent.getDiagnosticInfo(), "\n");
+ container.addDiagnostics(exitEvent.getDiagnosticInfo() + "\n");
}
// The process/process-grp is killed. Decrement reference counts and
@@ -1890,7 +1890,7 @@ public class ContainerImpl implements Container {
} else {
ContainerKillEvent killEvent = (ContainerKillEvent) event;
container.exitCode = killEvent.getContainerExitStatus();
- container.addDiagnostics(killEvent.getDiagnostic(), "\n");
+ container.addDiagnostics(killEvent.getDiagnostic() + "\n");
container.addDiagnostics("Container is killed before being launched.\n");
container.metrics.killedContainer();
NMAuditLogger.logSuccess(container.user,
@@ -2010,7 +2010,7 @@ public class ContainerImpl implements Container {
public void transition(ContainerImpl container, ContainerEvent event) {
ContainerDiagnosticsUpdateEvent updateEvent =
(ContainerDiagnosticsUpdateEvent) event;
- container.addDiagnostics(updateEvent.getDiagnosticsUpdate(), "\n");
+ container.addDiagnostics(updateEvent.getDiagnosticsUpdate() + "\n");
}
}
@@ -2028,7 +2028,7 @@ public class ContainerImpl implements Container {
new ContainersLauncherEvent(container,
ContainersLauncherEventType.PAUSE_CONTAINER));
ContainerPauseEvent pauseEvent = (ContainerPauseEvent) event;
- container.addDiagnostics(pauseEvent.getDiagnostic(), "\n");
+ container.addDiagnostics(pauseEvent.getDiagnostic() + "\n");
}
}
@@ -2061,7 +2061,7 @@ public class ContainerImpl implements Container {
new ContainersLauncherEvent(container,
ContainersLauncherEventType.RESUME_CONTAINER));
ContainerResumeEvent resumeEvent = (ContainerResumeEvent) event;
- container.addDiagnostics(resumeEvent.getDiagnostic(), "\n");
+ container.addDiagnostics(resumeEvent.getDiagnostic() + "\n");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org