This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch HBASE-29081_rebased in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d88c16009b66e811341e5e1ce8b33384542958e9 Author: Andor Molnar <[email protected]> AuthorDate: Fri Mar 13 14:27:51 2026 -0500 Build fix --- .../org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java | 1 + .../java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java | 2 +- .../hadoop/hbase/master/procedure/RefreshHFilesRegionProcedure.java | 2 +- .../org/apache/hadoop/hbase/master/region/MasterRegionFactory.java | 2 +- .../org/apache/hadoop/hbase/regionserver/RefreshHFilesCallable.java | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java index 4559c3ae504..cad2a8c7abd 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java @@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.backup.util.BackupUtils; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.CommonFSUtils; import org.apache.hadoop.hbase.wal.AbstractFSWALProvider; import org.apache.yetus.audience.InterfaceAudience; diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java index 971e80e2f83..65ddad05097 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.java @@ -204,6 +204,6 @@ public class BackupLogCleaner extends BaseLogCleanerDelegate { String fn = path.getName(); return fn.startsWith(WALProcedureStore.LOG_PREFIX) || fn.endsWith(MasterRegionFactory.ARCHIVED_WAL_SUFFIX) - || path.toString().contains("/%s/".formatted(MasterRegionFactory.MASTER_STORE_DIR)); + || path.toString().contains("/%s/".formatted(MasterRegionFactory.MASTER_REGION_DIR_NAME)); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RefreshHFilesRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RefreshHFilesRegionProcedure.java index 0680826a4c2..6f6e0fb46f5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RefreshHFilesRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RefreshHFilesRegionProcedure.java @@ -168,7 +168,7 @@ public class RefreshHFilesRegionProcedure extends Procedure<MasterProcedureEnv> } @Override - public void remoteOperationCompleted(MasterProcedureEnv env) { + public void remoteOperationCompleted(MasterProcedureEnv env, byte[] remoteResultData) { complete(env, null); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegionFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegionFactory.java index cec8cd4ce9e..89df83c2b81 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegionFactory.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegionFactory.java @@ -60,7 +60,7 @@ public final class MasterRegionFactory { // Default master data dir private static final String MASTER_REGION_DIR_NAME_DEFAULT = "MasterData"; - private static final String MASTER_REGION_DIR_NAME; + public static final String MASTER_REGION_DIR_NAME; static { Configuration conf = HBaseConfiguration.create(); MASTER_REGION_DIR_NAME = initMasterRegionDirName(conf); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RefreshHFilesCallable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RefreshHFilesCallable.java index f864bf4c2c0..153449b3c80 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RefreshHFilesCallable.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RefreshHFilesCallable.java @@ -42,7 +42,7 @@ public class RefreshHFilesCallable extends BaseRSProcedureCallable { private RegionInfo regionInfo; @Override - protected void doCall() throws Exception { + protected byte[] doCall() throws Exception { HRegion region = rs.getRegion(regionInfo.getEncodedName()); LOG.debug("Starting refreshHfiles operation on region {}", region); @@ -53,6 +53,7 @@ public class RefreshHFilesCallable extends BaseRSProcedureCallable { } catch (IOException ioe) { LOG.warn("Exception while trying to refresh store files: ", ioe); } + return null; } @Override
