[2/7] hbase git commit: HBASE-20935 HStore.removeCompactedFiles should log in case it is unable to delete a file (Vishal Khandelwal)

[apurtell]

HBASE-20935 HStore.removeCompactedFiles should log in case it is unable to 
delete a file (Vishal Khandelwal)

Conflicts:
        
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/777f3e88
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/777f3e88
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/777f3e88

Branch: refs/heads/branch-2
Commit: 777f3e88e216967b01e5bed019b3519a849aac7a
Parents: 99714da
Author: Andrew Purtell <apurt...@apache.org>
Authored: Tue Jul 31 15:58:05 2018 -0700
Committer: Andrew Purtell <apurt...@apache.org>
Committed: Tue Jul 31 15:59:53 2018 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/regionserver/HStore.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/777f3e88/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 ea9ea4a..424a357 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
@@ -2554,6 +2554,11 @@ public class HStore implements Store, HeapSize, 
StoreConfigInformation, Propagat
             r.close(true);
             // Just close and return
             filesToRemove.add(file);
+          } else {
+            LOG.info("Can't archive compacted file " + file.getPath()
+                + " because of either isCompactedAway = " + 
file.isCompactedAway()
+                + " or file has reference, isReferencedInReads = " + 
file.isReferencedInReads()
+                + ", skipping for now.");
           }
         } catch (Exception e) {
           LOG.error("Exception while trying to close the compacted store file 
{}",