(hbase) branch branch-3 updated: HBASE-29239: Subsequent runs of re-splitting HFiles can fail because we don't cleanup the MR directory (#6876) (#6878)

[rm...@apache.org]

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

rmattingly 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 2b00d577e06 HBASE-29239: Subsequent runs of re-splitting HFiles can fail because we don't cleanup the MR directory (#6876) (#6878)
2b00d577e06 is described below

commit 2b00d577e0624d8cc308d70847f445bb0249f5fc
Author: Ray Mattingly <rm...@apache.org>
AuthorDate: Mon Apr 7 15:32:02 2025 -0400

    HBASE-29239: Subsequent runs of re-splitting HFiles can fail because we don't cleanup the MR directory (#6876) (#6878)
    
    Signed-off-by: Ray Mattingly <rm...@apache.org>
    Co-authored-by: Hernan Romer <na...@gmail.com>
    Co-authored-by: Hernan Gelaf-Romer <hg...@hubspot.com>
---
 .../apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java  | 3 +++
 1 file changed, 3 insertions(+)

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 52f824c5dda..a868a9a6203 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
@@ -218,6 +218,9 @@ public class IncrementalTableBackupClient extends TableBackupClient {
       result = player.run(args);
     } catch (Exception e) {
       LOG.error("Failed to run MapReduceHFileSplitterJob", e);
+      // Delete the bulkload directory if we fail to run the HFile splitter job for any reason
+      // as it might be re-tried
+      deleteBulkLoadDirectory();
       throw new IOException(e);
     }