You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2010/05/27 01:08:57 UTC
svn commit: r948631 - in /hbase/branches/0.20: CHANGES.txt
src/java/org/apache/hadoop/hbase/HMsg.java
src/java/org/apache/hadoop/hbase/master/ServerManager.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: jdcryans
Date: Wed May 26 23:08:56 2010
New Revision: 948631
URL: http://svn.apache.org/viewvc?rev=948631&view=rev
Log:
HBASE-2613 Remove the code around MSG_CALL_SERVER_STARTUP
Modified:
hbase/branches/0.20/CHANGES.txt
hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HMsg.java
hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/ServerManager.java
hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/CHANGES.txt?rev=948631&r1=948630&r2=948631&view=diff
==============================================================================
--- hbase/branches/0.20/CHANGES.txt (original)
+++ hbase/branches/0.20/CHANGES.txt Wed May 26 23:08:56 2010
@@ -20,6 +20,7 @@ Release 0.20.5 - Wed May 26 00:15:56 PDT
IMPROVEMENTS
HBASE-2567 [stargate] minimize differences between 0.20 branch and trunk
HBASE-2568 Add new svn, ml, and website locations into branches/0.20/src/doc
+ HBASE-2613 Remove the code around MSG_CALL_SERVER_STARTUP
Release 0.20.4 - Mon May 3 16:16:02 PDT 2010
INCOMPATIBLE CHANGES
Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HMsg.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HMsg.java?rev=948631&r1=948630&r2=948631&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HMsg.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HMsg.java Wed May 26 23:08:56 2010
@@ -53,9 +53,6 @@ public class HMsg implements Writable {
/** 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,
Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=948631&r1=948630&r2=948631&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/ServerManager.java Wed May 26 23:08:56 2010
@@ -65,8 +65,6 @@ class ServerManager implements HConstant
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 @@ class ServerManager implements HConstant
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:
//
Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=948631&r1=948630&r2=948631&view=diff
==============================================================================
--- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed May 26 23:08:56 2010
@@ -507,37 +507,6 @@ public class HRegionServer implements HC
}
}
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 @@ public class HRegionServer implements HC
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()) {