(hbase) branch branch-2.6 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-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git


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

commit d879630cd890faa90d6ae920948c403b94a4db8f
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 9314ce2277d..50eceb84996 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
@@ -421,9 +421,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 e18b1f8d135..a91e6f01a6f 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
@@ -393,6 +393,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);