This is an automated email from the ASF dual-hosted git repository.
taklwu 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 213f3417948 HBASE-29503: IntegrationTestBackupRestore is passing even
if an exception occurs in the thread(s) it creates (#7203) (#7226) (#7247)
213f3417948 is described below
commit 213f34179487f003e157ce567605ac877ba2b154
Author: Kevin Geiszler <[email protected]>
AuthorDate: Tue Aug 26 15:11:22 2025 -0700
HBASE-29503: IntegrationTestBackupRestore is passing even if an exception
occurs in the thread(s) it creates (#7203) (#7226) (#7247)
Signed-off-by: Tak Lon (Stephen) Wu <[email protected]>
---
.../hadoop/hbase/IntegrationTestBackupRestore.java | 75 ++++++++++++++++------
1 file changed, 56 insertions(+), 19 deletions(-)
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
index 4326c9852e3..0e18cb491ce 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
@@ -101,6 +101,38 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
private static String BACKUP_ROOT_DIR = "backupIT";
+ /*
+ * This class is used to run the backup and restore thread(s). Throwing an
exception in this
+ * thread will not cause the test to fail, so the purpose of this class is
to both kick off the
+ * backup and restore and record any exceptions that occur so they can be
thrown in the main
+ * thread.
+ */
+ protected class BackupAndRestoreThread implements Runnable {
+ private final TableName table;
+ private Exception exc;
+
+ public BackupAndRestoreThread(TableName table) {
+ this.table = table;
+ this.exc = null;
+ }
+
+ public Exception getException() {
+ return this.exc;
+ }
+
+ @Override
+ public void run() {
+ try {
+ runTestSingle(this.table);
+ } catch (Exception e) {
+ LOG.error(
+ "An exception occurred in thread {} when performing a backup and
restore with table {}: ",
+ Thread.currentThread().getName(), this.table.getNameAsString(), e);
+ this.exc = e;
+ }
+ }
+ }
+
@Override
@Before
public void setUp() throws Exception {
@@ -174,28 +206,35 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
runTestMulti();
}
- private void runTestMulti() throws IOException {
+ private void runTestMulti() throws Exception {
LOG.info("IT backup & restore started");
Thread[] workers = new Thread[numTables];
+ BackupAndRestoreThread[] backupAndRestoreThreads = new
BackupAndRestoreThread[numTables];
for (int i = 0; i < numTables; i++) {
final TableName table = tableNames[i];
- Runnable r = new Runnable() {
- @Override
- public void run() {
- try {
- runTestSingle(table);
- } catch (IOException e) {
- LOG.error("Failed", e);
- Assert.fail(e.getMessage());
- }
- }
- };
- workers[i] = new Thread(r);
+ BackupAndRestoreThread backupAndRestoreThread = new
BackupAndRestoreThread(table);
+ backupAndRestoreThreads[i] = backupAndRestoreThread;
+ workers[i] = new Thread(backupAndRestoreThread);
workers[i].start();
}
- // Wait all workers to finish
- for (Thread t : workers) {
- Uninterruptibles.joinUninterruptibly(t);
+ // Wait for all workers to finish and check for errors
+ Exception error = null;
+ Exception threadExc;
+ for (int i = 0; i < numTables; i++) {
+ Uninterruptibles.joinUninterruptibly(workers[i]);
+ threadExc = backupAndRestoreThreads[i].getException();
+ if (threadExc == null) {
+ continue;
+ }
+ if (error == null) {
+ error = threadExc;
+ } else {
+ error.addSuppressed(threadExc);
+ }
+ }
+ // Throw any found errors after all threads have completed
+ if (error != null) {
+ throw error;
}
LOG.info("IT backup & restore finished");
}
@@ -229,8 +268,7 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
}
private String backup(BackupRequest request, BackupAdmin client) throws
IOException {
- String backupId = client.backupTables(request);
- return backupId;
+ return client.backupTables(request);
}
private void restore(RestoreRequest request, BackupAdmin client) throws
IOException {
@@ -300,7 +338,6 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
private void restoreVerifyTable(Connection conn, BackupAdmin client,
TableName table,
String backupId, long expectedRows) throws IOException {
-
TableName[] tablesRestoreIncMultiple = new TableName[] { table };
restore(
createRestoreRequest(BACKUP_ROOT_DIR, backupId, false,
tablesRestoreIncMultiple, null, true),
