svn commit: r1195056 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/Threads.java

[st...@apache.org]

Author: stack
Date: Sat Oct 29 22:01:59 2011
New Revision: 1195056

URL: http://svn.apache.org/viewvc?rev=1195056&view=rev
Log:
HBASE-4613 hbase.util.Threads#threadDumpingIsAlive sleeps 1 second, slowing down the shutdown by 0.5s

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Threads.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1195056&r1=1195055&r2=1195056&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Oct 29 22:01:59 2011
@@ -428,6 +428,8 @@ Release 0.92.0 - Unreleased
    HBASE-4701  TestMasterObserver fails up on jenkins
    HBASE-4700  TestSplitTransactionOnCluster fails on occasion when it tries
                to move a region
+   HBASE-4613  hbase.util.Threads#threadDumpingIsAlive sleeps 1 second,
+               slowing down the shutdown by 0.5s
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Threads.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Threads.java?rev=1195056&r1=1195055&r2=1195056&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Threads.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Threads.java Sat Oct 29 22:01:59 2011
@@ -106,11 +106,10 @@ public class Threads {
     if (t == null) {
       return;
     }
-    long startTime = System.currentTimeMillis();
+
     while (t.isAlive()) {
-      Thread.sleep(1000);
-      if (System.currentTimeMillis() - startTime > 60000) {
-        startTime = System.currentTimeMillis();
+      t.join(60 * 1000);
+      if (t.isAlive()) {
         ReflectionUtils.printThreadInfo(new PrintWriter(System.out),
             "Automatic Stack Trace every 60 seconds waiting on " +
             t.getName());