Repository: hadoop Updated Branches: refs/heads/branch-2 6e97a3c96 -> dbc4c79b4
YARN-4400. AsyncDispatcher.waitForDrained should be final. Contributed by Daniel Templeton. (cherry picked from commit bb5df272b9c0be9830ee8480cd33e75d26deb9d1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dbc4c79b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dbc4c79b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dbc4c79b Branch: refs/heads/branch-2 Commit: dbc4c79b446564502c62c51ce65096bd1b605e89 Parents: 6e97a3c Author: Junping Du <[email protected]> Authored: Wed Dec 23 08:55:12 2015 -0800 Committer: Junping Du <[email protected]> Committed: Wed Dec 23 08:55:55 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbc4c79b/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7315ba2..5afca7b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1130,6 +1130,9 @@ Release 2.8.0 - UNRELEASED YARN-4477. FairScheduler: Handle condition which can result in an infinite loop in attemptScheduling. (Tao Jie via asuresh) + YARN-4400. AsyncDispatcher.waitForDrained should be final. (Daniel Templeton + via junping_du) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbc4c79b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java index 403381b..ee6a637 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java @@ -59,7 +59,7 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher { // Indicates all the remaining dispatcher's events on stop have been drained // and processed. private volatile boolean drained = true; - private Object waitForDrained = new Object(); + private final Object waitForDrained = new Object(); // For drainEventsOnStop enabled only, block newly coming events into the // queue while stopping.
