From c9fc396dfac0288829058b04aa9ddffec67caacf Mon Sep 17 00:00:00 2001
From: Sergey Soldatov <ssa@apache.org>
Date: Thu, 26 May 2022 03:01:21 -0700
Subject: [PATCH] HBASE-27061 two phase bulkload is broken when SFT is in use.
 (#4465)

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
---
 .../org/apache/hadoop/hbase/regionserver/HRegion.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index d2cdeea7fac6..a18680efd5e8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -353,7 +353,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
   private final int rowLockWaitDuration;
   static final int DEFAULT_ROWLOCK_WAIT_DURATION = 30000;
 
-  private Path regionDir;
+  private Path regionWalDir;
   private FileSystem walFS;
 
   // set to true if the region is restored from snapshot
@@ -2051,11 +2051,11 @@ FileSystem getWalFileSystem() throws IOException {
    * @throws IOException if there is an error getting WALRootDir
    */
   public Path getWALRegionDir() throws IOException {
-    if (regionDir == null) {
-      regionDir = CommonFSUtils.getWALRegionDir(conf, getRegionInfo().getTable(),
+    if (regionWalDir == null) {
+      regionWalDir = CommonFSUtils.getWALRegionDir(conf, getRegionInfo().getTable(),
         getRegionInfo().getEncodedName());
     }
-    return regionDir;
+    return regionWalDir;
   }
 
   @Override
@@ -6813,7 +6813,7 @@ public Map<byte[], List<Path>> bulkLoadHFiles(Collection<Pair<byte[], String>> f
           boolean reqTmp = store.storeEngine.requireWritingToTmpDirFirst();
           if (bulkLoadListener != null) {
             finalPath = bulkLoadListener.prepareBulkLoad(familyName, path, copyFile,
-              reqTmp ? null : regionDir.toString());
+              reqTmp ? null : fs.getRegionDir().toString());
           }
           Pair<Path, Path> pair = null;
           if (reqTmp) {