CDPD-83261: 2.6 rebase breaks TestHStore in cdh_main (apache#593)

Co-authored-by: Wellington Ramos Chevreuil <wchevreuil@apache.org>

Author: wchevreuil

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

@@ -902,16 +902,9 @@ private boolean completeFlush(List<HStoreFile> sfs, long snapshotId) throws IOEx
     // NOTE:we should keep clearSnapshot method inside the write lock because clearSnapshot may
     // close {@link DefaultMemStore#snapshot}, which may be used by
     // {@link DefaultMemStore#getScanners}.
-    sfs = storeEngine.addStoreFiles(sfs,() -> {}).stream().collect(Collectors.toList());;
-      // NOTE: here we must increase the refCount for storeFiles because we would open the
-      // storeFiles and get the StoreFileScanners for them in HStore.notifyChangedReadersObservers.
-      // If we don't increase the refCount here, HStore.closeAndArchiveCompactedFiles called by
-      // CompactedHFilesDischarger may archive the storeFiles after a concurrent compaction.Because
-      // HStore.requestCompaction is under storeEngine lock, so here we increase the refCount under
-      // storeEngine lock. see HBASE-27519 for more details.
-      if (snapshotId > 0) {
-        this.memstore.clearSnapshot(snapshotId);
-      }
+    sfs = storeEngine.addStoreFiles(sfs,(snapshotId > 0) ?
+      () ->  this.memstore.clearSnapshot(snapshotId) :
+      () -> {}).stream().collect(Collectors.toList());
       HStoreFile.increaseStoreFilesRefeCount(sfs);
     // notify to be called here - only in case of flushes
     try {