(hbase) branch branch-2.6 updated: HBASE-29622 : Flaky Test in TestBackupDelete (#7364)

[wchevreuil]

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

wchevreuil 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 9fca7f45cfe HBASE-29622 : Flaky Test in TestBackupDelete (#7364)
9fca7f45cfe is described below

commit 9fca7f45cfea26aeaf33708b377a6acdc2f0ae16
Author: Dev Hingu <dhi...@cloudera.com>
AuthorDate: Fri Oct 31 01:39:14 2025 +0530

    HBASE-29622 : Flaky Test in TestBackupDelete (#7364)
    
    Signed-off-by: Wellington Chevreuil <wchevre...@apache.org>
    Reviewed-by: Vaibhav Joshi <vjo...@cloudera.com>
---
 .../java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
index c2253a46d04..20f83bc2d1e 100644
--- 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
+++ 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
@@ -1247,7 +1247,10 @@ public final class BackupSystemTable implements 
Closeable {
    * @return put operation
    */
   private Put createPutForIncrBackupTableSet(Set<TableName> tables, String 
backupRoot) {
-    Put put = new Put(rowkey(INCR_BACKUP_SET, backupRoot));
+    // added 1ms to prevent LostUpdate problem in case when 
deleteIncrementalBackupTableSet()
+    // executed very fast
+    long ts = EnvironmentEdgeManager.currentTime() + 1;
+    Put put = new Put(rowkey(INCR_BACKUP_SET, backupRoot), ts);
     for (TableName table : tables) {
       put.addColumn(BackupSystemTable.META_FAMILY, 
Bytes.toBytes(table.getNameAsString()),
         EMPTY_VALUE);