Index: src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 948628) +++ src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -507,37 +507,6 @@ } } switch(msgs[i].getType()) { - case MSG_CALL_SERVER_STARTUP: - // We the MSG_CALL_SERVER_STARTUP on startup but we can also - // get it when the master is panicking because for instance - // the HDFS has been yanked out from under it. Be wary of - // this message. - if (checkFileSystem()) { - closeAllRegions(); - try { - hlog.closeAndDelete(); - } catch (Exception e) { - LOG.error("error closing and deleting HLog", e); - } - try { - serverInfo.setStartCode(System.currentTimeMillis()); - hlog = setupHLog(); - this.hlogFlusher.setHLog(hlog); - } catch (IOException e) { - this.abortRequested = true; - this.stopRequested.set(true); - e = RemoteExceptionHandler.checkIOException(e); - LOG.fatal("error restarting server", e); - break; - } - reportForDuty(); - restart = true; - } else { - LOG.fatal("file system available check failed. " + - "Shutting down server."); - } - break; - case MSG_REGIONSERVER_STOP: stopRequested.set(true); break; @@ -1040,8 +1009,7 @@ return isOnline; } - private HLog setupHLog() throws RegionServerRunningException, - IOException { + private HLog setupHLog() throws IOException { Path logdir = new Path(rootDir, HLog.getHLogDirectoryName(this.serverInfo)); if (LOG.isDebugEnabled()) { Index: src/java/org/apache/hadoop/hbase/master/ServerManager.java =================================================================== --- src/java/org/apache/hadoop/hbase/master/ServerManager.java (revision 948628) +++ src/java/org/apache/hadoop/hbase/master/ServerManager.java (working copy) @@ -65,8 +65,6 @@ new HMsg(Type.MSG_REGIONSERVER_QUIESCE); private static final HMsg REGIONSERVER_STOP = new HMsg(Type.MSG_REGIONSERVER_STOP); - private static final HMsg CALL_SERVER_STARTUP = - new HMsg(Type.MSG_CALL_SERVER_STARTUP); private static final HMsg [] EMPTY_HMSG_ARRAY = new HMsg[0]; private final AtomicInteger quiescedServers = new AtomicInteger(0); @@ -293,12 +291,12 @@ if (storedInfo == null) { if (LOG.isDebugEnabled()) { LOG.debug("Received report from unknown server -- telling it " + - "to " + CALL_SERVER_STARTUP + ": " + info.getServerName()); + "to " + REGIONSERVER_STOP + ": " + info.getServerName()); } // The HBaseMaster may have been restarted. - // Tell the RegionServer to start over and call regionServerStartup() - return new HMsg[] {CALL_SERVER_STARTUP}; + // Tell the RegionServer to abort! + return new HMsg[] {REGIONSERVER_STOP}; } else if (storedInfo.getStartCode() != info.getStartCode()) { // This state is reachable if: // Index: src/java/org/apache/hadoop/hbase/HMsg.java =================================================================== --- src/java/org/apache/hadoop/hbase/HMsg.java (revision 948628) +++ src/java/org/apache/hadoop/hbase/HMsg.java (working copy) @@ -53,9 +53,6 @@ /** Compact the specified region */ MSG_REGION_COMPACT, - - /** Region server is unknown to master. Restart */ - MSG_CALL_SERVER_STARTUP, /** Master tells region server to stop */ MSG_REGIONSERVER_STOP,