HBASE-27021 StoreFileInfo should set its initialPath in a consistent way

(Amending spotless errors after revert by Duo)
apache · May 12, 2022 · 930bc53 · 930bc53
1 parent e3359ef
commit 930bc53
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
@@ -139,7 +139,7 @@ private StoreFileInfo(final Configuration conf, final FileSystem fs, final FileS
 
     this.fs = fs;
     this.conf = conf;
-    this.initialPath = initialPath;
+    this.initialPath = fs.makeQualified(initialPath);
     this.primaryReplica = primaryReplica;
     this.noReadahead =
       this.conf.getBoolean(STORE_FILE_READER_NO_READAHEAD, DEFAULT_STORE_FILE_READER_NO_READAHEAD);

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -941,13 +941,16 @@ private void archiveStoreFile(int index) throws IOException {
   private void closeCompactedFile(int index) throws IOException {
     Collection<HStoreFile> files =
       this.store.getStoreEngine().getStoreFileManager().getCompactedfiles();
-    HStoreFile sf = null;
-    Iterator<HStoreFile> it = files.iterator();
-    for (int i = 0; i <= index; i++) {
-      sf = it.next();
+    if (files.size() > 0) {
+      HStoreFile sf = null;
+      Iterator<HStoreFile> it = files.iterator();
+      for (int i = 0; i <= index; i++) {
+        sf = it.next();
+      }
+      sf.closeStoreFile(true);
+      store.getStoreEngine().getStoreFileManager()
+        .removeCompactedFiles(Collections.singletonList(sf));
     }
-    sf.closeStoreFile(true);
-    store.getStoreEngine().getStoreFileManager().removeCompactedFiles(Lists.newArrayList(sf));
   }
 
   @Test