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

[rmattingly]

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

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

commit fb36b62efbb9b0417cab33a6fe9b1633e265e702
Author: Ray Mattingly <rmattin...@apache.org>
AuthorDate: Mon Apr 7 15:33:05 2025 -0400

    HBASE-29239: Subsequent runs of re-splitting HFiles can fail because we 
don't cleanup the MR directory (#6876) (#6880)
    
    Signed-off-by: Ray Mattingly <rmattin...@apache.org>
    Co-authored-by: Hernan Romer <nanu...@gmail.com>
    Co-authored-by: Hernan Gelaf-Romer <hgelafro...@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 ab1163aeed8..885f942c77a 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
@@ -219,6 +219,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);
     }