Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-1114 Weird NPEs compacting 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@733213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-01-10 00:59:30 +00:00
parent 7acb2ad440
commit fc2157ae44
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -137,6 +137,7 @@ Release 0.19.0 - Unreleased
IllegalStateException: Cannot set a region to be closed it it was IllegalStateException: Cannot set a region to be closed it it was
not already marked as closing, Does not recover if HRS carrying not already marked as closing, Does not recover if HRS carrying
-ROOT- goes down -ROOT- goes down
HBASE-1114 Weird NPEs compacting
IMPROVEMENTS IMPROVEMENTS
HBASE-901 Add a limit to key length, check key and value length on client side HBASE-901 Add a limit to key length, check key and value length on client side

5
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -696,8 +696,9 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
private boolean checkOOME(final Throwable e) { private boolean checkOOME(final Throwable e) {
boolean stop = false; boolean stop = false;
if (e instanceof OutOfMemoryError || if (e instanceof OutOfMemoryError ||
(e.getCause()!= null && e.getCause() instanceof OutOfMemoryError) || (e.getCause() != null && e.getCause() instanceof OutOfMemoryError) ||
e.getMessage().contains("java.lang.OutOfMemoryError")) { (e.getMessage() != null &&
e.getMessage().contains("java.lang.OutOfMemoryError"))) {
LOG.fatal("OutOfMemoryError, aborting.", e); LOG.fatal("OutOfMemoryError, aborting.", e);
abort(); abort();
stop = true; stop = true;

6
src/java/org/apache/hadoop/hbase/regionserver/HStore.java
View File

@ -866,8 +866,10 @@ public class HStore implements HConstants {
return null; return null;
} }
int len = 0; int len = 0;
for (FileStatus fstatus:fs.listStatus(path)) { // listStatus can come back null.
len += fstatus.getLen(); FileStatus [] fss = this.fs.listStatus(path);
for (int ii = 0; fss != null && i < fss.length; ii++) {
len += fss[ii].getLen();
} }
fileSizes[i] = len; fileSizes[i] = len;
totalSize += len; totalSize += len;

18
src/webapps/master/WEB-INF/web.xml
View File

@ -15,13 +15,13 @@ Automatically created by Tomcat JspC.
</servlet> </servlet>
<servlet> <servlet>
<servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name> <servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name>
<servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class> <servlet-class>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-class>
</servlet> </servlet>
<servlet> <servlet>
<servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name> <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
<servlet-class>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-class> <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
@ -29,15 +29,15 @@ Automatically created by Tomcat JspC.
<url-pattern>/master.jsp</url-pattern> <url-pattern>/master.jsp</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
<url-pattern>/table.jsp</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name> <servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name>
<url-pattern>/regionhistorian.jsp</url-pattern> <url-pattern>/regionhistorian.jsp</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
<url-pattern>/table.jsp</url-pattern>
</servlet-mapping>
</web-app> </web-app>