[hbase] branch branch-1 updated: HBASE-23590 : Update maxCompactedStoreFileRef (ADDENDUM)

[vjasani]

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1 by this push:
     new 19b35d2  HBASE-23590 : Update maxCompactedStoreFileRef (ADDENDUM)
19b35d2 is described below

commit 19b35d2b1977d8ab1967cd72aa216a93fba779ee
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Thu Jan 2 19:07:54 2020 +0530

    HBASE-23590 : Update maxCompactedStoreFileRef (ADDENDUM)
---
 .../java/org/apache/hadoop/hbase/regionserver/HStore.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 c8e36ed..d7eadec 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
@@ -2878,12 +2878,15 @@ public class HStore implements Store {
    */
   public int getMaxCompactedStoreFileRefCount() {
     int maxCompactedStoreFileRefCount = 0;
-    for (StoreFile store : 
storeEngine.getStoreFileManager().getCompactedfiles()) {
-      if (store.isHFile()) {
-        StoreFile.Reader storeReader = store.getReader();
-        if (storeReader != null) {
-          maxCompactedStoreFileRefCount = 
Math.max(maxCompactedStoreFileRefCount,
-            storeReader.getRefCount());
+    Collection<StoreFile> compactedFiles = 
storeEngine.getStoreFileManager().getCompactedfiles();
+    if (compactedFiles != null) {
+      for (StoreFile store : compactedFiles) {
+        if (store.isHFile()) {
+          StoreFile.Reader storeReader = store.getReader();
+          if (storeReader != null) {
+            maxCompactedStoreFileRefCount = 
Math.max(maxCompactedStoreFileRefCount,
+              storeReader.getRefCount());
+          }
         }
       }
     }