Skip to content

[WIP] HBASE-29411: extend integration test backup restore #7414

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

Closed
wants to merge 11 commits into from
Closed

[WIP] HBASE-29411: extend integration test backup restore #7414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
446b4cc
Extend IntegrationTestBackup restore into a base class with continuou…
kgeisz Oct 17, 2025
4339ffd
Add more test cases to runTestSingle for testContinuousBackupRestore
kgeisz Oct 18, 2025
b0caea6
Add more test cases for full continuous backup; Change while loop to …
kgeisz Oct 21, 2025
8d6340f
Add delete test case
kgeisz Oct 23, 2025
372cfe3
Start adding changes after looking at WIP PR in GitHub
kgeisz Oct 24, 2025
a2822ad
Continue adding changes after looking at WIP PR in GitHub
kgeisz Oct 24, 2025
8bac8e6
Run mvn spotless:apply
kgeisz Oct 24, 2025
c2ab491
Add documentation for runTestMulti and runTestSingle
kgeisz Oct 24, 2025
3024ea6
Update documentation
kgeisz Oct 24, 2025
a7fdfc2
Enhance delete test case
kgeisz Oct 25, 2025
d0eb5ee
Update method name to verifyBackupExistenceAfterMerge
kgeisz Oct 27, 2025
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
21 changes: 19 additions & 2 deletions hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/BackupTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,20 @@
*/
package org.apache.hadoop.hbase.backup;

import static org.apache.hadoop.hbase.backup.BackupRestoreConstants.CONTINUOUS_BACKUP_REPLICATION_PEER;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;
import org.apache.hadoop.hbase.backup.impl.BackupManager;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
import org.apache.yetus.audience.InterfaceAudience;

@InterfaceAudience.Private
Expand All @@ -46,10 +52,21 @@ static BackupInfo verifyBackup(Configuration conf, String backupId, BackupType e
}
}

static void enableBackup(Configuration conf) {
// Enable backup
public static void enableBackup(Configuration conf) {
conf.setBoolean(BackupRestoreConstants.BACKUP_ENABLE_KEY, true);
BackupManager.decorateMasterConfiguration(conf);
BackupManager.decorateRegionServerConfiguration(conf);
}

public static void verifyReplicationPeerSubscription(HBaseTestingUtil util, TableName tableName)
throws IOException {
try (Admin admin = util.getAdmin()) {
ReplicationPeerDescription peerDesc = admin.listReplicationPeers().stream()
.filter(peer -> peer.getPeerId().equals(CONTINUOUS_BACKUP_REPLICATION_PEER)).findFirst()
.orElseThrow(() -> new AssertionError("Replication peer not found"));

assertTrue("Table should be subscribed to the replication peer",
peerDesc.getPeerConfig().getTableCFsMap().containsKey(tableName));
}
}
}
20 changes: 3 additions & 17 deletions hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestContinuousBackup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.hbase.backup;

import static org.apache.hadoop.hbase.backup.BackupRestoreConstants.CONF_CONTINUOUS_BACKUP_WAL_DIR;
import static org.apache.hadoop.hbase.backup.BackupRestoreConstants.CONTINUOUS_BACKUP_REPLICATION_PEER;
import static org.apache.hadoop.hbase.backup.BackupRestoreConstants.OPTION_ENABLE_CONTINUOUS_BACKUP;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand All @@ -36,8 +35,6 @@
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupManifest;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.util.ToolRunner;
import org.junit.After;
Expand Down Expand Up @@ -114,7 +111,7 @@ public void testContinuousBackupWithFullBackup() throws Exception {
}

// Verify replication peer subscription
verifyReplicationPeerSubscription(tableName);
BackupTestUtil.verifyReplicationPeerSubscription(TEST_UTIL, tableName);

// Verify table is registered in Backup System Table
verifyTableInBackupSystemTable(tableName);
Expand Down Expand Up @@ -157,8 +154,8 @@ public void testContinuousBackupForMultipleTables() throws Exception {
}

// Verify replication peer subscription for each table
verifyReplicationPeerSubscription(tableName1);
verifyReplicationPeerSubscription(tableName2);
BackupTestUtil.verifyReplicationPeerSubscription(TEST_UTIL, tableName1);
BackupTestUtil.verifyReplicationPeerSubscription(TEST_UTIL, tableName2);

// Verify tables are registered in Backup System Table
verifyTableInBackupSystemTable(tableName1);
Expand Down Expand Up @@ -248,17 +245,6 @@ public void testContinuousBackupWithIncrementalBackup() throws Exception {
}
}

private void verifyReplicationPeerSubscription(TableName table) throws IOException {
try (Admin admin = TEST_UTIL.getAdmin()) {
ReplicationPeerDescription peerDesc = admin.listReplicationPeers().stream()
.filter(peer -> peer.getPeerId().equals(CONTINUOUS_BACKUP_REPLICATION_PEER)).findFirst()
.orElseThrow(() -> new AssertionError("Replication peer not found"));

assertTrue("Table should be subscribed to the replication peer",
peerDesc.getPeerConfig().getTableCFsMap().containsKey(table));
}
}

String[] buildBackupArgs(String backupType, TableName[] tables, boolean continuousEnabled) {
String tableNames =
Arrays.stream(tables).map(TableName::getNameAsString).collect(Collectors.joining(","));
Expand Down
7 changes: 7 additions & 0 deletions hbase-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-backup</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-logging</artifactId>
Expand Down
Loading