You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2016/11/01 19:49:40 UTC
[16/50] [abbrv] hbase git commit: HBASE-16807,
RegionServer will fail to report new active Hmaster until
HMaster/RegionServer failover.
HBASE-16807, RegionServer will fail to report new active Hmaster until HMaster/RegionServer failover.
Signed-off-by: chenheng <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/27398ea5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/27398ea5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/27398ea5
Branch: refs/heads/branch-1
Commit: 27398ea525be88f9d8089071e0d7f212f33c2ca8
Parents: 8f9fadf
Author: Pankaj Kumar <pa...@huawei.com>
Authored: Thu Oct 13 20:19:07 2016 +0800
Committer: chenheng <ch...@apache.org>
Committed: Thu Oct 13 22:17:28 2016 +0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/HRegionServer.java | 18 +++++++++++++++---
.../TestRegionServerReportForDuty.java | 4 ++--
2 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/27398ea5/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 03dcd4e..f3eb27f 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
@@ -1196,7 +1196,7 @@ public class HRegionServer extends HasThread implements
}
// Couldn't connect to the master, get location from zk and reconnect
// Method blocks until new master is found or we are stopped
- createRegionServerStatusStub();
+ createRegionServerStatusStub(true);
}
}
@@ -2235,12 +2235,24 @@ public class HRegionServer extends HasThread implements
*/
@VisibleForTesting
protected synchronized ServerName createRegionServerStatusStub() {
+ // Create RS stub without refreshing the master node from ZK, use cached data
+ return createRegionServerStatusStub(false);
+ }
+
+ /**
+ * Get the current master from ZooKeeper and open the RPC connection to it. To get a fresh
+ * connection, the current rssStub must be null. Method will block until a master is available.
+ * You can break from this block by requesting the server stop.
+ * @param refresh If true then master address will be read from ZK, otherwise use cached data
+ * @return master + port, or null if server has been stopped
+ */
+ @VisibleForTesting
+ protected synchronized ServerName createRegionServerStatusStub(boolean refresh) {
if (rssStub != null) {
return masterAddressTracker.getMasterAddress();
}
ServerName sn = null;
long previousLogTime = 0;
- boolean refresh = false; // for the first time, use cached data
RegionServerStatusService.BlockingInterface intf = null;
boolean interrupted = false;
try {
@@ -2315,7 +2327,7 @@ public class HRegionServer extends HasThread implements
* @throws IOException
*/
private RegionServerStartupResponse reportForDuty() throws IOException {
- ServerName masterServerName = createRegionServerStatusStub();
+ ServerName masterServerName = createRegionServerStatusStub(true);
if (masterServerName == null) return null;
RegionServerStartupResponse result = null;
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/27398ea5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
index 5778c6c..77cb5b7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
@@ -166,8 +166,8 @@ public class TestRegionServerReportForDuty {
}
@Override
- protected synchronized ServerName createRegionServerStatusStub() {
- sn = super.createRegionServerStatusStub();
+ protected synchronized ServerName createRegionServerStatusStub(boolean refresh) {
+ sn = super.createRegionServerStatusStub(refresh);
rpcStubCreatedFlag = true;
// Wait for master switch over. Only do this for the second region server.