Repository: hadoop Updated Branches: refs/heads/HDFS-9806 c2bcffb34 -> c37346d0e
YARN=5526. DrainDispacher#serviceStop blocked if setDrainEventsOnStop invoked (sandflee via Varun Saxena) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/913a8951 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/913a8951 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/913a8951 Branch: refs/heads/HDFS-9806 Commit: 913a8951366a5d816bbae253b230250e0b74849e Parents: 20f0eb8 Author: Varun Saxena <varunsax...@apache.org> Authored: Thu Aug 18 11:38:13 2016 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Thu Aug 18 11:38:13 2016 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/yarn/event/AsyncDispatcher.java | 6 +++++- .../java/org/apache/hadoop/yarn/event/DrainDispatcher.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/913a8951/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 5dea1c8..89b5861 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 @@ -148,7 +148,7 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher { YarnConfiguration.DEFAULT_DISPATCHER_DRAIN_EVENTS_TIMEOUT); synchronized (waitForDrained) { - while (!drained && eventHandlingThread != null + while (!isDrained() && eventHandlingThread != null && eventHandlingThread.isAlive() && System.currentTimeMillis() < endTime) { waitForDrained.wait(1000); @@ -303,4 +303,8 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher { protected boolean isEventThreadWaiting() { return eventHandlingThread.getState() == Thread.State.WAITING; } + + protected boolean isDrained() { + return drained; + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/913a8951/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/DrainDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/DrainDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/DrainDispatcher.java index cf4b1b5..f769492 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/DrainDispatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/DrainDispatcher.java @@ -95,6 +95,11 @@ public class DrainDispatcher extends AsyncDispatcher { } @Override + protected boolean isDrained() { + return drained; + } + + @Override protected void serviceStop() throws Exception { stopped = true; super.serviceStop(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
