svn merge -c 1411289 FIXES: YARN-219. NM should aggregate logs when application finishes. (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411295 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
fa6b7fca7a
commit
f1653b3ea8
|
@ -230,6 +230,8 @@ Release 0.23.5 - UNRELEASED
|
|||
YARN-212. NM state machine ignores an APPLICATION_CONTAINER_FINISHED event
|
||||
when it shouldn't (Nathan Roberts via jlowe)
|
||||
|
||||
YARN-219. NM should aggregate logs when application finishes. (bobby)
|
||||
|
||||
Release 0.23.4
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -149,16 +149,13 @@ public class AppLogAggregatorImpl implements AppLogAggregator {
|
|||
ContainerId containerId;
|
||||
|
||||
while (!this.appFinishing.get()) {
|
||||
try {
|
||||
containerId = this.pendingContainers.poll();
|
||||
if (containerId == null) {
|
||||
Thread.sleep(THREAD_SLEEP_TIME);
|
||||
} else {
|
||||
uploadLogsForContainer(containerId);
|
||||
synchronized(this) {
|
||||
try {
|
||||
wait(THREAD_SLEEP_TIME);
|
||||
} catch (InterruptedException e) {
|
||||
LOG.warn("PendingContainers queue is interrupted");
|
||||
this.appFinishing.set(true);
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
LOG.warn("PendingContainers queue is interrupted");
|
||||
this.appFinishing.set(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -251,8 +248,9 @@ public class AppLogAggregatorImpl implements AppLogAggregator {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void finishLogAggregation() {
|
||||
public synchronized void finishLogAggregation() {
|
||||
LOG.info("Application just finished : " + this.applicationId);
|
||||
this.appFinishing.set(true);
|
||||
this.notifyAll();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue