This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit cfb45b6b39ae0adcee085d16998c782b73920017 Author: DieterDP <[email protected]> AuthorDate: Sat May 10 09:42:55 2025 +0200 HBASE-29271 TestIncrementalBackupWithBulkLoad is flaky (#6966) Signed-off-by: Duo Zhang <[email protected]> (cherry picked from commit fbf310ea6310f9ba1ce9e24cfeb8275aa09ef921) --- .../main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java index e294cb887c1..5e5098a7b66 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManager.java @@ -30,6 +30,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupHFileCleaner; import org.apache.hadoop.hbase.backup.BackupInfo; import org.apache.hadoop.hbase.backup.BackupInfo.BackupState; +import org.apache.hadoop.hbase.backup.BackupMasterObserver; import org.apache.hadoop.hbase.backup.BackupObserver; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.BackupType; @@ -120,7 +121,7 @@ public class BackupManager implements Closeable { conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, (plugins == null ? "" : plugins + ",") + BackupHFileCleaner.class.getName()); - String observerClass = BackupObserver.class.getName(); + String observerClass = BackupMasterObserver.class.getName(); String masterCoProc = conf.get(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY); conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, (masterCoProc == null ? "" : masterCoProc + ",") + observerClass);
