Skip to content

HBASE-30037: FullTableBackupClient should not delete bulk load tracking entries before backup completion #7994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nazuhifu wants to merge 1 commit into
base: master
Choose a base branch
from
+63 −3
Open

HBASE-30037: FullTableBackupClient should not delete bulk load tracking entries before backup completion #7994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ public void execute() throws IOException {
Map<TableName, Map<String, Long>> newTableSetTimestampMap =
backupManager.readLogTimestampMap();

backupManager
.deleteBulkLoadedRows(bulkLoadsToDelete.stream().map(BulkLoad::getRowKey).toList());

// backup complete
backupInfo.setTableSetTimestampMap(newTableSetTimestampMap);
completeBackup(conn, backupInfo, BackupType.FULL, conf);

backupManager
.deleteBulkLoadedRows(bulkLoadsToDelete.stream().map(BulkLoad::getRowKey).toList());
} catch (Exception e) {
failBackup(conn, backupInfo, backupManager, e, "Unexpected BackupException : ",
Copy link
Copy Markdown
Contributor

@vaijosh vaijosh Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @nazuhifu

What happens if the backup completes successfully but a failure occurs during the deleteBulkLoadedRows call? In that case, it appears the operation is reported as a BackupFailure, even though the backup itself succeeded and only the post-cleanup step failed.

Can we improve this behavior to distinguish between backup success and cleanup failure?

BackupType.FULL, conf);
Expand Down
60 changes: 60 additions & 0 deletions ...ackup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

Expand All @@ -27,19 +28,24 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
import org.apache.hadoop.hbase.backup.impl.BulkLoad;
import org.apache.hadoop.hbase.backup.impl.FullTableBackupClient;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.tool.BulkLoadHFiles;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.CommonFSUtils;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.HFileArchiveUtil;
import org.apache.hadoop.hbase.util.HFileTestUtil;
import org.junit.jupiter.api.Tag;
Expand Down Expand Up @@ -237,6 +243,60 @@ public void testUpdateFileListsMissingArchivedFile() throws Exception {
}
}

@Test
public void testFailedFullBackupKeepsTrackedBulkLoads() throws Exception {
TableName tableName = TableName.valueOf("bulk-load-full-failure-" + System.nanoTime());
TEST_UTIL.createTable(tableName, famName).close();

try (BackupSystemTable systemTable = new BackupSystemTable(TEST_UTIL.getConnection())) {
String backupId = backupTables(BackupType.FULL, List.of(tableName), BACKUP_ROOT_DIR);
assertTrue(checkSucceeded(backupId));

String keyPrefix = "full-backup-failure";
FileSystem fs = TEST_UTIL.getTestFileSystem();
Path baseDirectory = new Path(TEST_UTIL.getDataTestDirOnTestFS(TEST_NAME),
tableName.getNameWithNamespaceInclAsString().replace(':', '_') + "_" + keyPrefix);
Path hfilePath =
new Path(baseDirectory, Bytes.toString(famName) + Path.SEPARATOR + "hfile_" + keyPrefix);

HFileTestUtil.createHFile(TEST_UTIL.getConfiguration(), fs, hfilePath, famName, qualName,
Bytes.toBytes(keyPrefix), Bytes.toBytes(keyPrefix + "z"), ROWS_IN_BULK_LOAD);

Map<BulkLoadHFiles.LoadQueueItem, ByteBuffer> bulkLoadResult =
BulkLoadHFiles.create(TEST_UTIL.getConfiguration()).bulkLoad(tableName, baseDirectory);
assertFalse(bulkLoadResult.isEmpty());
assertEquals(1, systemTable.readBulkloadRows(List.of(tableName)).size());

BackupRequest request = createBackupRequest(BackupType.FULL, List.of(tableName),
BACKUP_ROOT_DIR);
long failingBackupTs = EnvironmentEdgeManager.currentTime();
String failingBackupId = BackupRestoreConstants.BACKUPID_PREFIX + failingBackupTs;
while (failingBackupId.equals(backupId)) {
failingBackupId = BackupRestoreConstants.BACKUPID_PREFIX + (++failingBackupTs);
}
Path targetTableBackupDir =
new Path(BackupUtils.getTableBackupDir(BACKUP_ROOT_DIR, failingBackupId, tableName));
FileSystem.get(targetTableBackupDir.toUri(), conf1).mkdirs(targetTableBackupDir);

try (Connection conn = ConnectionFactory.createConnection(conf1)) {
FullTableBackupClient failingClient =
new FullTableBackupClient(conn, failingBackupId, request) {
@Override
protected void completeBackup(final Connection conn, BackupInfo backupInfo,
BackupType type, Configuration conf) throws IOException {
throw new IOException("Injected failure before completing backup");
}
};

assertThrows(IOException.class, failingClient::execute);
}
assertTrue(checkFailed(failingBackupId));
assertEquals(1, systemTable.readBulkloadRows(List.of(tableName)).size());
} finally {
TEST_UTIL.deleteTable(tableName);
}
}

private void performBulkLoad(String keyPrefix) throws IOException {
FileSystem fs = TEST_UTIL.getTestFileSystem();
Path baseDirectory = TEST_UTIL.getDataTestDirOnTestFS(TEST_NAME);
Expand Down