HBASE-20102 AssignmentManager#shutdown doesn't shut down scheduled executor
Signed-off-by: Josh Elser <els...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9a7a3675 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9a7a3675 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9a7a3675 Branch: refs/heads/branch-1 Commit: 9a7a36750f3880721451992025fbac93aa4ebea2 Parents: 27f803f Author: Andrew Purtell <apurt...@apache.org> Authored: Tue Feb 27 15:53:43 2018 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Tue Feb 27 17:11:28 2018 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/AssignmentManager.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9a7a3675/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index e2acc09..6dec3ce 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -3790,6 +3790,7 @@ public class AssignmentManager extends ZooKeeperListener { // Shutdown the threadpool executor service threadPoolExecutorService.shutdownNow(); + scheduledThreadPoolExecutor.shutdownNow(); zkEventWorkers.shutdownNow(); regionStateStore.stop(); }
