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

HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1210212 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2011-12-04 20:54:37 +00:00
parent f547de07c8
commit 8fe805ce29
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -450,6 +450,7 @@ Release 0.92.0 - Unreleased
HBASE-4877 TestHCM failing sporadically on jenkins and always for me on an
ubuntu machine
HBASE-4878 Master crash when splitting hlog may cause data loss (Chunhui Shen)
HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H)
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected

21
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -2977,20 +2977,19 @@ public class HRegion implements HeapSize { // , Writable{
"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();