From 1ecb0fce342ee878cf96f7a3165007192bedb2ef Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Mon, 8 Aug 2016 10:39:35 -0700
Subject: [PATCH] HBASE-16367 Race between master and region server
 initialization may lead to premature server abort - addendum shortens the
 waiting duration

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

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 ba5d669aa42..0b4ae75904f 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