You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/12/08 20:00:28 UTC
hbase git commit: HBASE-14632 Region server aborts due to unguarded
dereference of Reader
Repository: hbase
Updated Branches:
refs/heads/branch-1.1 86aa45b12 -> 1b427f198
HBASE-14632 Region server aborts due to unguarded dereference of Reader
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b427f19
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b427f19
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b427f19
Branch: refs/heads/branch-1.1
Commit: 1b427f1987fe355cd6475c2836d2791a67a3c8cb
Parents: 86aa45b
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 8 11:00:26 2015 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 8 11:00:26 2015 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/HStore.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b427f19/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index fd738f5..788b5bc 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -2123,7 +2123,11 @@ public class HStore implements Store {
public long getTotalStaticIndexSize() {
long size = 0;
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;
}
@@ -2133,6 +2137,9 @@ public class HStore implements Store {
long size = 0;
for (StoreFile s : this.storeEngine.getStoreFileManager().getStorefiles()) {
StoreFile.Reader r = s.getReader();
+ if (r == null) {
+ continue;
+ }
size += r.getTotalBloomSize();
}
return size;