HBASE-29622 : Flaky Test : TestBackupDelete#testBackupDeleteUpdatesIncrementalBackupSet

Author: dev-work-8103

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java

@@ -186,7 +186,10 @@ private void finalizeDelete(List<String> backupRoots, BackupSystemTable table)
 
  table.deleteIncrementalBackupTableSet(backupRoot);
  if (!incrTableSet.isEmpty()) {
- table.addIncrementalBackupTableSet(incrTableSet, backupRoot);
+ // added 1ms to prevent LostUpdate problem in case when deleteIncrementalBackupTableSet()
+ // executed very fast
+ long ts = EnvironmentEdgeManager.currentTime() + 1;
+ table.addIncrementalBackupTableSet(incrTableSet, backupRoot, ts);
  }
  }
  }

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java

@@ -899,6 +899,18 @@ public Set<TableName> getIncrementalBackupTableSet(String backupRoot) throws IOE
  * @throws IOException exception
  */
  public void addIncrementalBackupTableSet(Set<TableName> tables, String backupRoot)
+ throws IOException {
+ addIncrementalBackupTableSet(tables, backupRoot, -1);
+ }
+
+ /**
+ * Add tables to global incremental backup set
+ * @param tables set of tables
+ * @param backupRoot root directory path to backup
+ * @param ts timestamp
+ * @throws IOException exception
+ */
+ public void addIncrementalBackupTableSet(Set<TableName> tables, String backupRoot, long ts)
  throws IOException {
  if (LOG.isTraceEnabled()) {
  LOG.trace("Add incremental backup table set to backup system table. ROOT=" + backupRoot
@@ -908,7 +920,7 @@ public void addIncrementalBackupTableSet(Set<TableName> tables, String backupRoo
  tables.forEach(table -> LOG.debug(Objects.toString(table)));
  }
  try (Table table = connection.getTable(tableName)) {
- Put put = createPutForIncrBackupTableSet(tables, backupRoot);
+ Put put = createPutForIncrBackupTableSet(tables, backupRoot, ts);
  table.put(put);
  }
  }
@@ -1243,11 +1255,18 @@ private Get createGetForIncrBackupTableSet(String backupRoot) throws IOException
 
  /**
  * Creates Put to store incremental backup table set
- * @param tables tables
+ * @param tables tables
+ * @param backupRoot root directory path to backup
+ * @param ts timestamp
  * @return put operation
  */
- private Put createPutForIncrBackupTableSet(Set<TableName> tables, String backupRoot) {
- Put put = new Put(rowkey(INCR_BACKUP_SET, backupRoot));
+ private Put createPutForIncrBackupTableSet(Set<TableName> tables, String backupRoot, long ts) {
+ Put put;
+ if (ts < 0) {
+ put = new Put(rowkey(INCR_BACKUP_SET, backupRoot));
+ } else {
+ put = new Put(rowkey(INCR_BACKUP_SET, backupRoot), ts);
+ }
  for (TableName table : tables) {
  put.addColumn(BackupSystemTable.META_FAMILY, Bytes.toBytes(table.getNameAsString()),
  EMPTY_VALUE);