(hbase) branch branch-3 updated: HBASE-29124 Restoring to original splits fails if bulkloads are on separate FileSystem (#6681)

[ndimiduk]

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

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


The following commit(s) were added to refs/heads/branch-3 by this push:
     new a86c209d916 HBASE-29124 Restoring to original splits fails if 
bulkloads are on separate FileSystem (#6681)
a86c209d916 is described below

commit a86c209d916f55228e64492b5b7abef613a1261c
Author: Hernan Romer <nanu...@gmail.com>
AuthorDate: Thu Feb 13 04:54:13 2025 -0500

    HBASE-29124 Restoring to original splits fails if bulkloads are on separate 
FileSystem (#6681)
    
    Co-authored-by: Hernan Gelaf-Romer <hgelafro...@hubspot.com>
    Signed-off-by: Nick Dimiduk <ndimi...@apache.org>
    Signed-off-by: Ray Mattingly <rmattin...@apache.org>
---
 .../hadoop/hbase/backup/impl/IncrementalTableBackupClient.java       | 3 +--
 .../java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java   | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
index 43db0491484..f388f73fd60 100644
--- 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
+++ 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java
@@ -419,9 +419,8 @@ public class IncrementalTableBackupClient extends 
TableBackupClient {
 
   private void incrementalCopyBulkloadHFiles(FileSystem tgtFs, TableName tn) 
throws IOException {
     Path bulkOutDir = getBulkOutputDirForTable(tn);
-    FileSystem fs = FileSystem.get(conf);
 
-    if (fs.exists(bulkOutDir)) {
+    if (tgtFs.exists(bulkOutDir)) {
       conf.setInt(MapReduceBackupCopyJob.NUMBER_OF_LEVELS_TO_PRESERVE_KEY, 2);
       Path tgtPath = getTargetDirForTable(tn);
       try {
diff --git 
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
 
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
index eba322ea919..c8765a19a24 100644
--- 
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
+++ 
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
@@ -395,6 +395,11 @@ public class TestIncrementalBackup extends TestBackupBase {
       assertTrue(checkSucceeded(fullBackupId));
 
       insertIntoTable(conn, table1, famName, 4, 100);
+
+      HRegion regionToBulkload = 
TEST_UTIL.getHBaseCluster().getRegions(table1).get(0);
+      String regionName = regionToBulkload.getRegionInfo().getEncodedName();
+      doBulkload(table1, regionName, famName);
+
       BackupRequest request =
         createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR, 
true);
       String incrementalBackupId = admin.backupTables(request);