apache · kgeisz · Sep 12, 2025 · Sep 12, 2025 · Sep 15, 2025 · Jul 6, 2022
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
@@ -59,8 +59,8 @@ pipeline {
     ASF_NIGHTLIES_BASE_ORI = "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}"
     ASF_NIGHTLIES_BASE = "${ASF_NIGHTLIES_BASE_ORI.replaceAll(' ', '%20')}"
     // These are dependent on the branch
-    HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1"
-    HADOOP3_DEFAULT_VERSION = "3.4.1"
+    HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1,3.4.2"
+    HADOOP3_DEFAULT_VERSION = "3.4.2"
   }
   parameters {
     booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, description: '''Check to use the current HEAD of apache/yetus rather than our configured release.

diff --git a/dev-support/create-release/release-util.sh b/dev-support/create-release/release-util.sh
@@ -969,7 +969,7 @@ function get_hadoop3_version() {
 # case spotless:check failure, so we should run spotless:apply before committing
 function maven_spotless_apply() {
   # our spotless plugin version requires at least java 11 to run, so we use java 17 here
-  JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64" "${MVN[@]}" spotless:apply
+  JAVA_HOME="${JAVA17_HOME}" "${MVN[@]}" spotless:apply
 }
 
 function git_add_poms() {

diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
@@ -612,17 +612,17 @@ function hadoopcheck_rebuild
     # TODO remove this on non 2.5 branches ?
     yetus_info "Setting Hadoop 3 versions to test based on branch-2.5 rules"
     if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
-      hbase_hadoop3_versions="3.2.4 3.3.6 3.4.0"
+      hbase_hadoop3_versions="3.2.4 3.3.6 3.4.1"
     else
-      hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0"
+      hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.1"
     fi
   else
     yetus_info "Setting Hadoop 3 versions to test based on branch-2.6+/master/feature branch rules"
     # Isn't runnung these tests with the default Hadoop version redundant ?
     if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
-      hbase_hadoop3_versions="3.3.6 3.4.0"
+      hbase_hadoop3_versions="3.3.6 3.4.1"
     else
-      hbase_hadoop3_versions="3.3.5 3.3.6 3.4.0"
+      hbase_hadoop3_versions="3.3.5 3.3.6 3.4.0 3.4.1"
     fi
   fi
 

diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
@@ -36,4 +36,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface ClientTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.ClientTests";
 }
diff --git a/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java b/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface CoprocessorTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.CoprocessorTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface FilterTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.FilterTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface FlakeyTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.FlakeyTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
@@ -36,4 +36,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface IOTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.IOTests";
 }
diff --git a/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java b/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
@@ -34,4 +34,5 @@
  * @see LargeTests
  */
 public interface IntegrationTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.IntegrationTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
@@ -33,4 +33,5 @@
  * @see IntegrationTests
  */
 public interface LargeTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.LargeTests";
 }
diff --git a/...-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java b/...-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface MapReduceTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.MapReduceTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface MasterTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.MasterTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
@@ -32,4 +32,5 @@
  * @see IntegrationTests
  */
 public interface MediumTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.MediumTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
@@ -21,4 +21,5 @@
  * Tag a test that covers our metrics handling.
  */
 public interface MetricsTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.MetricsTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface MiscTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.MiscTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface RPCTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.RPCTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RSGroupTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RSGroupTests.java
@@ -21,4 +21,5 @@
  * Tag the tests related to rs group feature.
  */
 public interface RSGroupTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.RSGroupTests";
 }
diff --git a/...notations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java b/...notations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface RegionServerTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.RegionServerTests";
 }
diff --git a/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java b/...nnotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface ReplicationTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.ReplicationTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface RestTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.RestTests";
 }
diff --git a/...e-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java b/...e-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
@@ -35,4 +35,5 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface SecurityTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.SecurityTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
@@ -30,4 +30,5 @@
  * @see IntegrationTests
  */
 public interface SmallTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.SmallTests";
 }
diff --git a/...ions/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java b/...ions/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
@@ -36,4 +36,6 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface VerySlowMapReduceTests {
+  public static final String TAG =
+    "org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests";
 }
diff --git a/...s/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java b/...s/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
@@ -36,4 +36,6 @@
  * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
  */
 public interface VerySlowRegionServerTests {
+  public static final String TAG =
+    "org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests";
 }
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
@@ -22,4 +22,5 @@
  * {@code RecoverableZooKeeper}, not for tests which depend on ZooKeeper.
  */
 public interface ZKTests {
+  public static final String TAG = "org.apache.hadoop.hbase.testclassification.ZKTests";
 }
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java
@@ -52,10 +52,13 @@ public class BackupHFileCleaner extends BaseHFileCleanerDelegate implements Abor
   private boolean stopped = false;
   private boolean aborted = false;
   private Connection connection;
-  // timestamp of most recent read from backup system table
-  private long prevReadFromBackupTbl = 0;
-  // timestamp of 2nd most recent read from backup system table
-  private long secondPrevReadFromBackupTbl = 0;
+  // timestamp of most recent completed cleaning run
+  private volatile long previousCleaningCompletionTimestamp = 0;
+
+  @Override
+  public void postClean() {
+    previousCleaningCompletionTimestamp = EnvironmentEdgeManager.currentTime();
+  }
 
   @Override
   public Iterable<FileStatus> getDeletableFiles(Iterable<FileStatus> files) {
@@ -79,12 +82,12 @@ public Iterable<FileStatus> getDeletableFiles(Iterable<FileStatus> files) {
       return Collections.emptyList();
     }
 
-    secondPrevReadFromBackupTbl = prevReadFromBackupTbl;
-    prevReadFromBackupTbl = EnvironmentEdgeManager.currentTime();
+    // Pin the threshold, we don't want the result to change depending on evaluation time.
+    final long recentFileThreshold = previousCleaningCompletionTimestamp;
 
     return Iterables.filter(files, file -> {
       // If the file is recent, be conservative and wait for one more scan of the bulk loads
-      if (file.getModificationTime() > secondPrevReadFromBackupTbl) {
+      if (file.getModificationTime() > recentFileThreshold) {
         LOG.debug("Preventing deletion due to timestamp: {}", file.getPath().toString());
         return false;
       }

diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
@@ -1668,9 +1668,7 @@ public static void restoreFromSnapshot(Connection conn) throws IOException {
     try (Admin admin = conn.getAdmin()) {
       String snapshotName = BackupSystemTable.getSnapshotName(conf);
       if (snapshotExists(admin, snapshotName)) {
-        admin.disableTable(BackupSystemTable.getTableName(conf));
-        admin.restoreSnapshot(snapshotName);
-        admin.enableTable(BackupSystemTable.getTableName(conf));
+        admin.restoreBackupSystemTable(snapshotName);
         LOG.debug("Done restoring backup system table");
       } else {
         // Snapshot does not exists, i.e completeBackup failed after

diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java
@@ -45,7 +45,6 @@
 import org.apache.hadoop.hbase.backup.BackupRequest;
 import org.apache.hadoop.hbase.backup.BackupRestoreFactory;
 import org.apache.hadoop.hbase.backup.BackupType;
-import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager;
 import org.apache.hadoop.hbase.backup.util.BackupUtils;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -204,7 +203,7 @@ private void handleContinuousBackup(Admin admin) throws IOException {
 
   private void handleNonContinuousBackup(Admin admin) throws IOException {
     initializeBackupStartCode(backupManager);
-    performLogRoll(admin);
+    performLogRoll();
     performBackupSnapshots(admin);
     backupManager.addIncrementalBackupTableSet(backupInfo.getTables());
 
@@ -228,18 +227,14 @@ private void initializeBackupStartCode(BackupManager backupManager) throws IOExc
     }
   }
 
-  private void performLogRoll(Admin admin) throws IOException {
+  private void performLogRoll() throws IOException {
     // We roll log here before we do the snapshot. It is possible there is duplicate data
     // in the log that is already in the snapshot. But if we do it after the snapshot, we
     // could have data loss.
     // A better approach is to do the roll log on each RS in the same global procedure as
     // the snapshot.
     LOG.info("Execute roll log procedure for full backup ...");
-    Map<String, String> props = new HashMap<>();
-    props.put("backupRoot", backupInfo.getBackupRootDir());
-    admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,
-      LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);
-
+    BackupUtils.logRoll(conn, backupInfo.getBackupRootDir(), conf);
     newTimestamps = backupManager.readRegionServerLastLogRollResult();
   }
 

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
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
@@ -29,9 +28,7 @@
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager;
 import org.apache.hadoop.hbase.backup.util.BackupUtils;
-import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
 import org.apache.hadoop.hbase.util.CommonFSUtils;
@@ -84,13 +81,8 @@ public Map<String, Long> getIncrBackupLogFileMap() throws IOException {
     }
 
     LOG.info("Execute roll log procedure for incremental backup ...");
-    HashMap<String, String> props = new HashMap<>();
-    props.put("backupRoot", backupInfo.getBackupRootDir());
+    BackupUtils.logRoll(conn, backupInfo.getBackupRootDir(), conf);
 
-    try (Admin admin = conn.getAdmin()) {
-      admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,
-        LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);
-    }
     newTimestamps = readRegionServerLastLogRollResult();
 
     logList = getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf, savedStartCode);