From 9a7a36750f3880721451992025fbac93aa4ebea2 Mon Sep 17 00:00:00 2001
From: Andrew Purtell <apurtell@apache.org>
Date: Tue, 27 Feb 2018 15:53:43 -0800
Subject: [PATCH] HBASE-20102 AssignmentManager#shutdown doesn't shut down
 scheduled executor

Signed-off-by: Josh Elser <elserj@apache.org>
---
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java   | 1 +
 1 file changed, 1 insertion(+)

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 e2acc096f84..6dec3ceac1e 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();
   }