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/10/14 20:26:58 UTC
svn commit: r704597 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Tue Oct 14 11:26:57 2008
New Revision: 704597
URL: http://svn.apache.org/viewvc?rev=704597&view=rev
Log:
HBASE-925 HRS NPE on way out if no master to connect to
Modified:
hadoop/hbase/trunk/CHANGES.txt
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=704597&r1=704596&r2=704597&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Oct 14 11:26:57 2008
@@ -23,6 +23,7 @@
HBASE-918 Region balancing during startup makes cluster unstable
HBASE-921 region close and open processed out of order; makes for
disagreement between master and regionserver on region state
+ HBASE-925 HRS NPE on way out if no master to connect to
IMPROVEMENTS
HBASE-901 Add a limit to key length, check key and value length on client side
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=704597&r1=704596&r2=704597&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 Tue Oct 14 11:26:57 2008
@@ -446,8 +446,10 @@
if (this.fsOk) {
// Only try to clean up if the file system is available
try {
- this.log.close();
- LOG.info("On abort, closed hlog");
+ if (this.log != null) {
+ this.log.close();
+ LOG.info("On abort, closed hlog");
+ }
} catch (IOException e) {
LOG.error("Unable to close log in abort",
RemoteExceptionHandler.checkIOException(e));