svn commit: r1411941 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java

[li...@apache.org]

Author: liyin
Date: Wed Nov 21 00:03:04 2012
New Revision: 1411941

URL: http://svn.apache.org/viewvc?rev=1411941&view=rev
Log:
[0.89-fb] [master] get ServerManager threads to not make the master to wait

Author: aaiyer

Summary:
master shutdown sometimes waits on these two chore threads.
Cut down the wait time, by calling triggerNow()

Test Plan: push to dev cluster and restart cluster a few times to see the lag

Reviewers: kannan, liyintang

Reviewed By: kannan

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D636295

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=1411941&r1=1411940&r2=1411941&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java Wed Nov 21 00:03:04 2012
@@ -1083,7 +1083,9 @@ public class ServerManager {
   }
 
   public void joinThreads() {
+    oldLogCleaner.triggerNow();
     Threads.shutdown(oldLogCleaner);
+    serverMonitorThread.triggerNow();
     Threads.shutdown(serverMonitorThread);
   }