diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index 064c2e6be67..6b9a0a566ed 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -179,8 +179,7 @@ public class ServerManager { } /** - * Let the server manager know a regionserver is requesting configurations. - * Regionserver will not be added here, but in its first report. + * Let the server manager know a new regionserver has come online * @param request the startup request * @param versionNumber the version number of the new regionserver * @param version the version of the new regionserver, could contain strings like "SNAPSHOT" @@ -203,6 +202,10 @@ public class ServerManager { ServerName sn = ServerName.valueOf(hostname, request.getPort(), request.getServerStartCode()); checkClockSkew(sn, request.getServerCurrentTime()); checkIsDead(sn, "STARTUP"); + if (!checkAndRecordNewServer(sn, ServerMetricsBuilder.of(sn, versionNumber, version))) { + LOG.warn( + "THIS SHOULD NOT HAPPEN, RegionServerStartup" + " could not record the server: " + sn); + } return sn; } @@ -253,6 +256,7 @@ public class ServerManager { if (null == this.onlineServers.replace(sn, sl)) { // Already have this host+port combo and its just different start code? // Just let the server in. Presume master joining a running cluster. + // recordNewServer is what happens at the end of reportServerStartup. // The only thing we are skipping is passing back to the regionserver // the ServerName to use. Here we presume a master has already done // that so we'll press on with whatever it gave us for ServerName. 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 9bd8148be9d..158fda13a22 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 @@ -1047,9 +1047,10 @@ public class HRegionServer extends Thread implements // node was created, in case any coprocessors want to use ZooKeeper this.rsHost = new RegionServerCoprocessorHost(this, this.conf); - // Get configurations from the Master. Break if server is stopped or - // the clusterup flag is down or hdfs went wacky. Then start up all Services. - // Use RetryCounter to get backoff in case Master is struggling to come up. + // Try and register with the Master; tell it we are here. Break if server is stopped or + // the clusterup flag is down or hdfs went wacky. Once registered successfully, go ahead and + // start up all Services. Use RetryCounter to get backoff in case Master is struggling to + // come up. LOG.debug("About to register with Master."); RetryCounterFactory rcf = new RetryCounterFactory(Integer.MAX_VALUE, this.sleeper.getPeriod(), 1000 * 60 * 5); @@ -1082,7 +1083,7 @@ public class HRegionServer extends Thread implements } } - // Run mode. + // We registered with the Master. Go into run mode. long lastMsg = System.currentTimeMillis(); long oldRequestCount = -1; // The main run loop. @@ -1116,14 +1117,7 @@ public class HRegionServer extends Thread implements } long now = System.currentTimeMillis(); if ((now - lastMsg) >= msgInterval) { - // Register with the Master now that our setup is complete. - if (tryRegionServerReport(lastMsg, now) && !online.get()) { - // Wake up anyone waiting for this server to online - synchronized (online) { - online.set(true); - online.notifyAll(); - } - } + tryRegionServerReport(lastMsg, now); lastMsg = System.currentTimeMillis(); } if (!isStopped() && !isAborted()) { @@ -1293,12 +1287,12 @@ public class HRegionServer extends Thread implements } @InterfaceAudience.Private - protected boolean tryRegionServerReport(long reportStartTime, long reportEndTime) + protected void tryRegionServerReport(long reportStartTime, long reportEndTime) throws IOException { RegionServerStatusService.BlockingInterface rss = rssStub; if (rss == null) { // the current server could be stopping. - return false; + return; } ClusterStatusProtos.ServerLoad sl = buildServerLoad(reportStartTime, reportEndTime); try { @@ -1318,9 +1312,7 @@ public class HRegionServer extends Thread 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(true); - return false; } - return true; } /** @@ -1683,6 +1675,11 @@ public class HRegionServer extends Thread implements ", sessionid=0x" + Long.toHexString(this.zooKeeper.getRecoverableZooKeeper().getSessionId())); + // Wake up anyone waiting for this server to online + synchronized (online) { + online.set(true); + online.notifyAll(); + } } catch (Throwable e) { stop("Failed initialization"); throw convertThrowableToIOE(cleanup(e, "Failed init"), @@ -2846,9 +2843,10 @@ public class HRegionServer extends Thread implements } /* - * Run initialization using parameters passed us by the master. + * Let the master know we're here Run initialization using parameters passed + * us by the master. * @return A Map of key/value configurations we got from the Master else - * null if we failed during report. + * null if we failed to register. * @throws IOException */ private RegionServerStartupResponse reportForDuty() throws IOException { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java index 89d19685fb7..f795eef86c0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java @@ -449,9 +449,8 @@ public class MiniHBaseCluster extends HBaseCluster { ServerName rsServerName = t.getRegionServer().getServerName(); long start = System.currentTimeMillis(); - ClusterStatus clusterStatus; + ClusterStatus clusterStatus = getClusterStatus(); while ((System.currentTimeMillis() - start) < timeout) { - clusterStatus = getClusterStatus(); if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) { return t; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetReplicationLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetReplicationLoad.java index 1fcd6464be7..ac9ae397267 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetReplicationLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetReplicationLoad.java @@ -58,9 +58,8 @@ public class TestGetReplicationLoad { } @Override - protected boolean tryRegionServerReport(long reportStartTime, long reportEndTime) { + protected void tryRegionServerReport(long reportStartTime, long reportEndTime) { // do nothing - return true; } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java index 4e9bf105ec5..51169333872 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java @@ -60,6 +60,12 @@ public class TestMasterMetrics { public MyMaster(Configuration conf) throws IOException, KeeperException, InterruptedException { super(conf); } + @Override + protected void tryRegionServerReport( + long reportStartTime, long reportEndTime) { + // do nothing + } + } @BeforeClass diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionInDeadRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionInDeadRegionServer.java index 9b5c523ee4d..78042cc976f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionInDeadRegionServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionInDeadRegionServer.java @@ -84,14 +84,13 @@ public class TestCompactionInDeadRegionServer { } @Override - protected boolean tryRegionServerReport(long reportStartTime, long reportEndTime) + protected void tryRegionServerReport(long reportStartTime, long reportEndTime) throws IOException { try { super.tryRegionServerReport(reportStartTime, reportEndTime); } catch (YouAreDeadException e) { // ignore, do not abort } - return true; } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.java index ffc3a199e47..30c954be5c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.java @@ -85,14 +85,13 @@ public class TestShutdownWhileWALBroken { } @Override - protected boolean tryRegionServerReport(long reportStartTime, long reportEndTime) + protected void tryRegionServerReport(long reportStartTime, long reportEndTime) throws IOException { try { super.tryRegionServerReport(reportStartTime, reportEndTime); } catch (YouAreDeadException e) { LOG.info("Caught YouAreDeadException, ignore", e); } - return true; } @Override