HBASE-16367 Race between master and region server initialization may lead to 
premature server abort - addendum shortens the waiting duration


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1ecb0fce
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1ecb0fce
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1ecb0fce

Branch: refs/heads/hbase-12439
Commit: 1ecb0fce342ee878cf96f7a3165007192bedb2ef
Parents: 50f3c95
Author: tedyu <[email protected]>
Authored: Mon Aug 8 10:39:35 2016 -0700
Committer: tedyu <[email protected]>
Committed: Mon Aug 8 10:39:35 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/1ecb0fce/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index ba5d669..0b4ae75 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -819,7 +819,7 @@ public class HRegionServer extends HasThread implements
     blockAndCheckIfStopped(this.clusterStatusTracker);
 
     if (this.initLatch != null) {
-      this.initLatch.await(50, TimeUnit.SECONDS);
+      this.initLatch.await(20, TimeUnit.SECONDS);
     }
     // Retrieve clusterId
     // Since cluster status is now up

Reply via email to