(hbase) branch branch-2 updated: HBASE-29296 Addendum, Missing critical snapshot expiration checks (#7189)

[lupeng]

This is an automated email from the ASF dual-hosted git repository.

lupeng pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 61a5c6cef9b HBASE-29296 Addendum, Missing critical snapshot expiration 
checks (#7189)
61a5c6cef9b is described below

commit 61a5c6cef9b85da7c112a4d399b4d3dba4e333a4
Author: Peng Lu <lup...@apache.org>
AuthorDate: Tue Aug 5 00:08:21 2025 +0800

    HBASE-29296 Addendum, Missing critical snapshot expiration checks (#7189)
    
    Signed-off-by: Nihal Jain <nihalj...@apache.org>
---
 .../java/org/apache/hadoop/hbase/backup/TestBackupRestoreExpiry.java  | 4 ++--
 .../hbase/master/procedure/TestSnapshotProcedureEarlyExpiration.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreExpiry.java
 
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreExpiry.java
index 4126ed74895..2ef9d237efa 100644
--- 
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreExpiry.java
+++ 
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreExpiry.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;
@@ -64,7 +64,7 @@ public class TestBackupRestoreExpiry extends TestBackupBase {
 
   @BeforeClass
   public static void setUp() throws Exception {
-    TEST_UTIL = new HBaseTestingUtil();
+    TEST_UTIL = new HBaseTestingUtility();
     conf1 = TEST_UTIL.getConfiguration();
     conf1.setLong(HConstants.DEFAULT_SNAPSHOT_TTL_CONFIG_KEY, 30);
     autoRestoreOnFailure = true;
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureEarlyExpiration.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureEarlyExpiration.java
index 0870f16face..e5d21159e50 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureEarlyExpiration.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSnapshotProcedureEarlyExpiration.java
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.SnapshotDescription;
 import org.apache.hadoop.hbase.client.SnapshotType;
@@ -53,7 +53,7 @@ public class TestSnapshotProcedureEarlyExpiration extends 
TestSnapshotProcedure
   @Override
   public void setup() throws Exception { // Copied from TestSnapshotProcedure 
with modified
                                          // SnapshotDescription
-    TEST_UTIL = new HBaseTestingUtil();
+    TEST_UTIL = new HBaseTestingUtility();
     Configuration config = TEST_UTIL.getConfiguration();
     // using SnapshotVerifyProcedure to verify snapshot
     config.setInt("hbase.snapshot.remote.verify.threshold", 1);