You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2011/12/04 21:54:49 UTC
svn commit: r1210213 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Author: larsh
Date: Sun Dec 4 20:54:48 2011
New Revision: 1210213
URL: http://svn.apache.org/viewvc?rev=1210213&view=rev
Log:
HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H)
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1210213&r1=1210212&r2=1210213&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Sun Dec 4 20:54:48 2011
@@ -457,6 +457,7 @@ Release 0.92.0 - Unreleased
HBASE-4899 Region would be assigned twice easily with continually killing
server and moving region in testing environment
(Chunhui Shen)
+ HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H)
TESTS
HBASE-4492 TestRollingRestart fails intermittently
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1210213&r1=1210212&r2=1210213&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Sun Dec 4 20:54:48 2011
@@ -2729,20 +2729,19 @@ public class HRegion implements HeapSize
"No such column family " + Bytes.toStringBinary(familyName));
ioes.add(ioe);
failures.add(p);
- }
-
- try {
- store.assertBulkLoadHFileOk(new Path(path));
- } catch (WrongRegionException wre) {
- // recoverable (file doesn't fit in region)
- failures.add(p);
- } catch (IOException ioe) {
- // unrecoverable (hdfs problem)
- ioes.add(ioe);
+ } else {
+ try {
+ store.assertBulkLoadHFileOk(new Path(path));
+ } catch (WrongRegionException wre) {
+ // recoverable (file doesn't fit in region)
+ failures.add(p);
+ } catch (IOException ioe) {
+ // unrecoverable (hdfs problem)
+ ioes.add(ioe);
+ }
}
}
-
// validation failed, bail out before doing anything permanent.
if (failures.size() != 0) {
StringBuilder list = new StringBuilder();