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

HBASE-14632 Region server aborts due to unguarded dereference of Reader

Browse Source
This commit is contained in:
tedyu 2015-11-06 13:40:14 -08:00
parent c69c74fcbf
commit c1a19dece0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
View File

@ -2123,7 +2123,11 @@ public class HStore implements Store {
public long getTotalStaticIndexSize() { public long getTotalStaticIndexSize() {
long size = 0; long size = 0;
for (StoreFile s : this.storeEngine.getStoreFileManager().getStorefiles()) { for (StoreFile s : this.storeEngine.getStoreFileManager().getStorefiles()) {
size += s.getReader().getUncompressedDataIndexSize(); StoreFile.Reader r = s.getReader();
if (r == null) {
continue;
}
size += r.getUncompressedDataIndexSize();
} }
return size; return size;
} }
@ -2133,6 +2137,9 @@ public class HStore implements Store {
long size = 0; long size = 0;
for (StoreFile s : this.storeEngine.getStoreFileManager().getStorefiles()) { for (StoreFile s : this.storeEngine.getStoreFileManager().getStorefiles()) {
StoreFile.Reader r = s.getReader(); StoreFile.Reader r = s.getReader();
if (r == null) {
continue;
}
size += r.getTotalBloomSize(); size += r.getTotalBloomSize();
} }
return size; return size;