Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-7607. Remove the trailing duplicated timestamp in container diagnostics message. Contributed by Weiwei Yang.

This commit is contained in:
Weiwei Yang 2017-12-07 17:29:40 +08:00
parent c2e8a5c229
commit e411dd6666
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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
View File

@ -1541,7 +1541,7 @@ public class ContainerImpl implements Container {
ContainerExitEvent exitEvent = (ContainerExitEvent) event; ContainerExitEvent exitEvent = (ContainerExitEvent) event;
container.exitCode = exitEvent.getExitCode(); container.exitCode = exitEvent.getExitCode();
if (exitEvent.getDiagnosticInfo() != null) { if (exitEvent.getDiagnosticInfo() != null) {
container.addDiagnostics(exitEvent.getDiagnosticInfo(), "\n"); container.addDiagnostics(exitEvent.getDiagnosticInfo() + "\n");
} }
// TODO: Add containerWorkDir to the deletion service. // TODO: Add containerWorkDir to the deletion service.
@ -1578,7 +1578,7 @@ public class ContainerImpl implements Container {
container.addDiagnostics("Diagnostic message from attempt " container.addDiagnostics("Diagnostic message from attempt "
+ n + " : ", "\n"); + n + " : ", "\n");
} }
container.addDiagnostics(exitEvent.getDiagnosticInfo(), "\n"); container.addDiagnostics(exitEvent.getDiagnosticInfo() + "\n");
} }
if (container.shouldRetry(container.exitCode)) { if (container.shouldRetry(container.exitCode)) {
@ -1737,7 +1737,7 @@ public class ContainerImpl implements Container {
ContainerResourceFailedEvent rsrcFailedEvent = ContainerResourceFailedEvent rsrcFailedEvent =
(ContainerResourceFailedEvent) event; (ContainerResourceFailedEvent) event;
container.addDiagnostics(rsrcFailedEvent.getDiagnosticMessage(), "\n"); container.addDiagnostics(rsrcFailedEvent.getDiagnosticMessage() + "\n");
// Inform the localizer to decrement reference counts and cleanup // Inform the localizer to decrement reference counts and cleanup
// resources. // resources.
@ -1760,7 +1760,7 @@ public class ContainerImpl implements Container {
container.metrics.endInitingContainer(); container.metrics.endInitingContainer();
ContainerKillEvent killEvent = (ContainerKillEvent) event; ContainerKillEvent killEvent = (ContainerKillEvent) event;
container.exitCode = killEvent.getContainerExitStatus(); container.exitCode = killEvent.getContainerExitStatus();
container.addDiagnostics(killEvent.getDiagnostic(), "\n"); container.addDiagnostics(killEvent.getDiagnostic() + "\n");
container.addDiagnostics("Container is killed before being launched.\n"); container.addDiagnostics("Container is killed before being launched.\n");
} }
} }
@ -1799,7 +1799,7 @@ public class ContainerImpl implements Container {
new ContainersLauncherEvent(container, new ContainersLauncherEvent(container,
ContainersLauncherEventType.CLEANUP_CONTAINER)); ContainersLauncherEventType.CLEANUP_CONTAINER));
ContainerKillEvent killEvent = (ContainerKillEvent) event; ContainerKillEvent killEvent = (ContainerKillEvent) event;
container.addDiagnostics(killEvent.getDiagnostic(), "\n"); container.addDiagnostics(killEvent.getDiagnostic() + "\n");
container.exitCode = killEvent.getContainerExitStatus(); container.exitCode = killEvent.getContainerExitStatus();
} }
} }
@ -1838,7 +1838,7 @@ public class ContainerImpl implements Container {
} }
if (exitEvent.getDiagnosticInfo() != null) { if (exitEvent.getDiagnosticInfo() != null) {
container.addDiagnostics(exitEvent.getDiagnosticInfo(), "\n"); container.addDiagnostics(exitEvent.getDiagnosticInfo() + "\n");
} }
// The process/process-grp is killed. Decrement reference counts and // The process/process-grp is killed. Decrement reference counts and
@ -1890,7 +1890,7 @@ public class ContainerImpl implements Container {
} else { } else {
ContainerKillEvent killEvent = (ContainerKillEvent) event; ContainerKillEvent killEvent = (ContainerKillEvent) event;
container.exitCode = killEvent.getContainerExitStatus(); container.exitCode = killEvent.getContainerExitStatus();
container.addDiagnostics(killEvent.getDiagnostic(), "\n"); container.addDiagnostics(killEvent.getDiagnostic() + "\n");
container.addDiagnostics("Container is killed before being launched.\n"); container.addDiagnostics("Container is killed before being launched.\n");
container.metrics.killedContainer(); container.metrics.killedContainer();
NMAuditLogger.logSuccess(container.user, NMAuditLogger.logSuccess(container.user,
@ -2010,7 +2010,7 @@ public class ContainerImpl implements Container {
public void transition(ContainerImpl container, ContainerEvent event) { public void transition(ContainerImpl container, ContainerEvent event) {
ContainerDiagnosticsUpdateEvent updateEvent = ContainerDiagnosticsUpdateEvent updateEvent =
(ContainerDiagnosticsUpdateEvent) event; (ContainerDiagnosticsUpdateEvent) event;
container.addDiagnostics(updateEvent.getDiagnosticsUpdate(), "\n"); container.addDiagnostics(updateEvent.getDiagnosticsUpdate() + "\n");
} }
} }
@ -2028,7 +2028,7 @@ public class ContainerImpl implements Container {
new ContainersLauncherEvent(container, new ContainersLauncherEvent(container,
ContainersLauncherEventType.PAUSE_CONTAINER)); ContainersLauncherEventType.PAUSE_CONTAINER));
ContainerPauseEvent pauseEvent = (ContainerPauseEvent) event; 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, new ContainersLauncherEvent(container,
ContainersLauncherEventType.RESUME_CONTAINER)); ContainersLauncherEventType.RESUME_CONTAINER));
ContainerResumeEvent resumeEvent = (ContainerResumeEvent) event; ContainerResumeEvent resumeEvent = (ContainerResumeEvent) event;
container.addDiagnostics(resumeEvent.getDiagnostic(), "\n"); container.addDiagnostics(resumeEvent.getDiagnostic() + "\n");
} }
} }