You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2008/05/27 06:17:58 UTC
svn commit: r660366 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/Flusher.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Mon May 26 21:17:52 2008
New Revision: 660366
URL: http://svn.apache.org/viewvc?rev=660366&view=rev
Log:
HBASE-644 DroppedSnapshotException but RegionServer doesn't restart
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=660366&r1=660365&r2=660366&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon May 26 21:17:52 2008
@@ -22,6 +22,7 @@
HBASE-589 Remove references to deprecated methods in Hadoop once
hadoop-0.17.0 is released
HBASE-638 Purge \r from src
+ HBASE-644 DroppedSnapshotException but RegionServer doesn't restart
IMPROVEMENTS
HBASE-559 MR example job to count table rows
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java?rev=660366&r1=660365&r2=660366&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java Mon May 26 21:17:52 2008
@@ -170,12 +170,10 @@
// Cache flush can fail in a few places. If it fails in a critical
// section, we get a DroppedSnapshotException and a replay of hlog
// is required. Currently the only way to do this is a restart of
- // the server.
+ // the server. Abort because hdfs is probably bad (HBASE-644 is a case
+ // where hdfs was bad but passed the hdfs check).
LOG.fatal("Replay of hlog required. Forcing server restart", ex);
- if (!server.checkFileSystem()) {
- return false;
- }
- server.stop();
+ server.abort();
return false;
} catch (IOException ex) {
LOG.error("Cache flush failed" +
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=660366&r1=660365&r2=660366&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Mon May 26 21:17:52 2008
@@ -631,12 +631,13 @@
/**
* Sets a flag that will cause all the HRegionServer threads to shut down
- * in an orderly fashion. Used by unit tests and called by Flusher
- * if it judges server needs to be restarted.
+ * in an orderly fashion. Used by unit tests.
*/
- public synchronized void stop() {
+ public void stop() {
this.stopRequested.set(true);
- notifyAll(); // Wakes run() if it is sleeping
+ synchronized(this) {
+ notifyAll(); // Wakes run() if it is sleeping
+ }
}
/**
@@ -645,7 +646,7 @@
* Used unit testing and on catastrophic events such as HDFS is yanked out
* from under hbase or we OOME.
*/
- public synchronized void abort() {
+ public void abort() {
this.abortRequested = true;
stop();
}
@@ -1385,8 +1386,7 @@
FSUtils.checkFileSystemAvailable(fs);
} catch (IOException e) {
LOG.fatal("Shutting down HRegionServer: file system not available", e);
- this.abortRequested = true;
- this.stopRequested.set(true);
+ abort();
fsOk = false;
}
}