interrupt all sleeping tasks

Author: dengzhhu653

itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/MetastoreHousekeepingLeaderTestBase.java

@@ -26,6 +26,7 @@
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars;
 import org.apache.hadoop.hive.metastore.leader.LeaderElection;
 import org.apache.hadoop.hive.metastore.leader.LeaderElectionContext;
+import org.apache.hadoop.hive.metastore.leader.LeaderElectionFactory;
 import org.apache.hadoop.hive.metastore.leader.LeaseLeaderElection;
 import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge;
 import org.apache.hadoop.hive.ql.stats.StatsUpdaterThread;
@@ -43,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -68,7 +70,7 @@ void setup(final String leaderHostName, Configuration configuration) throws Exce
     MetaStoreTestUtils.setConfForStandloneMode(conf);
     MetastoreConf.setVar(conf, ConfVars.THRIFT_BIND_HOST, "localhost");
     MetastoreConf.setVar(conf, ConfVars.METASTORE_HOUSEKEEPING_LEADER_ELECTION,
-        leaderHostName != null ? "host" : "lock");
+        leaderHostName != null ? LeaderElectionFactory.Method.HOST.name() : LeaderElectionFactory.Method.LOCK.name());
     if (leaderHostName != null) {
       MetastoreConf.setVar(conf, ConfVars.METASTORE_HOUSEKEEPING_LEADER_HOSTNAME, leaderHostName);
     }
@@ -286,6 +288,10 @@ public void setName(String name) {
 
     @Override
     protected void notifyListener() {
+      ScheduledExecutorService service = null;
+      if (!isLeader) {
+        service = ThreadPool.getPool();
+      }
       super.notifyListener();
       if (isLeader) {
         if (!needRenewLease) {
@@ -298,10 +304,13 @@ protected void notifyListener() {
           heartbeater.startWatch();
         }
       } else {
+        Assert.assertTrue(service.isShutdown());
+        // Interrupt all sleeping tasks
+        service.shutdownNow();
         try {
           // This is the last one get notified, sleep some time to make sure all other
           // services have been stopped before return
-          Thread.sleep(12000);
+          Thread.sleep(3000);
         } catch (InterruptedException ignore) {
         }
       }