Repository: hbase Updated Branches: refs/heads/0.98 f60e0bd8f -> 357450219
HBASE-11488 cancelTasks in SubprocedurePool can hang during task error (Jerry He) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/35745021 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/35745021 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/35745021 Branch: refs/heads/0.98 Commit: 35745021924b7c9c050a57f8b6723759c4aedd79 Parents: f60e0bd Author: Andrew Purtell <apurt...@apache.org> Authored: Fri Jul 11 15:57:41 2014 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri Jul 11 15:57:41 2014 -0700 ---------------------------------------------------------------------- .../regionserver/snapshot/RegionServerSnapshotManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/35745021/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java index e78d690..d92f20a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/RegionServerSnapshotManager.java @@ -349,11 +349,8 @@ public class RegionServerSnapshotManager extends RegionServerProcedureManager { } // evict remaining tasks and futures from taskPool. - while (!futures.isEmpty()) { - // block to remove cancelled futures; - LOG.warn("Removing cancelled elements from taskPool"); - futures.remove(taskPool.take()); - } + futures.clear(); + while (taskPool.poll() != null) {} stop(); }
