This is an automated email from the ASF dual-hosted git repository. vjasani pushed a commit to branch HBASE-29368-key-management-feature in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 552e072eb394821d89ca0488a23c8f4da5fc3394 Merge: 281dc166c2c ffed09d96bb Author: Viraj Jasani <[email protected]> AuthorDate: Fri Sep 12 11:20:21 2025 -0700 Merge branch 'master' into HBASE-29368-key-management-feature hbase-annotations/pom.xml | 7 + hbase-archetypes/hbase-client-project/pom.xml | 19 +- .../hbase-shaded-client-project/pom.xml | 19 +- hbase-assembly-byo-hadoop/pom.xml | 19 +- hbase-assembly/pom.xml | 19 +- hbase-asyncfs/pom.xml | 19 +- hbase-backup/pom.xml | 19 +- .../hbase/backup/impl/FullTableBackupClient.java | 7 +- .../backup/impl/IncrementalBackupManager.java | 10 +- .../hadoop/hbase/backup/util/BackupUtils.java | 51 ++++ .../apache/hadoop/hbase/backup/TestBackupBase.java | 7 +- .../hadoop/hbase/backup/TestBackupMerge.java | 19 +- hbase-balancer/pom.xml | 19 +- .../master/balancer/CacheAwareLoadBalancer.java | 3 + hbase-checkstyle/pom.xml | 7 + hbase-client/pom.xml | 19 +- .../java/org/apache/hadoop/hbase/client/Admin.java | 10 + .../hadoop/hbase/client/AdminOverAsyncAdmin.java | 5 + .../org/apache/hadoop/hbase/client/AsyncAdmin.java | 9 + .../hadoop/hbase/client/AsyncHBaseAdmin.java | 5 + .../hbase/client/AsyncNonMetaRegionLocator.java | 5 +- .../hbase/client/ConnectionConfiguration.java | 3 + .../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 138 ++++++++-- .../client/metrics/ServerSideScanMetrics.java | 10 + .../apache/hadoop/hbase/quotas/QuotaTableUtil.java | 31 --- .../hbase/shaded/protobuf/RequestConverter.java | 6 + hbase-common/pom.xml | 19 +- .../org/apache/hadoop/hbase/util/FutureUtils.java | 2 +- hbase-common/src/main/resources/hbase-default.xml | 7 + hbase-dev-generate-classpath/pom.xml | 20 +- hbase-diagnostics/pom.xml | 19 +- hbase-endpoint/pom.xml | 19 +- hbase-examples/pom.xml | 19 +- hbase-extensions/hbase-openssl/pom.xml | 7 + hbase-external-blockcache/pom.xml | 19 +- hbase-hadoop-compat/pom.xml | 19 +- hbase-hbtop/pom.xml | 20 ++ hbase-http/pom.xml | 19 +- hbase-it/pom.xml | 19 +- hbase-logging/pom.xml | 19 +- hbase-mapreduce/pom.xml | 19 +- hbase-metrics-api/pom.xml | 19 +- hbase-metrics/pom.xml | 19 +- hbase-procedure/pom.xml | 19 +- .../procedure2/RemoteProcedureDispatcher.java | 2 +- hbase-protocol-shaded/pom.xml | 19 +- .../src/main/protobuf/HBase.proto | 4 + .../src/main/protobuf/server/master/Master.proto | 12 + .../protobuf/server/master/MasterProcedure.proto | 18 ++ .../server/master/RegionServerStatus.proto | 1 + .../src/main/protobuf/server/region/Admin.proto | 1 - hbase-replication/pom.xml | 19 +- hbase-rest/pom.xml | 19 +- hbase-server/pom.xml | 19 +- .../apache/hadoop/hbase/executor/EventType.java | 8 +- .../apache/hadoop/hbase/executor/ExecutorType.java | 3 +- .../org/apache/hadoop/hbase/master/HMaster.java | 24 +- .../hadoop/hbase/master/MasterRpcServices.java | 19 +- .../apache/hadoop/hbase/master/MasterServices.java | 6 + .../apache/hadoop/hbase/master/ServerManager.java | 8 + .../assignment/MergeTableRegionsProcedure.java | 4 +- .../assignment/RegionRemoteProcedureBase.java | 2 +- .../assignment/RegionTransitionProcedure.java | 2 +- .../master/procedure/FlushRegionProcedure.java | 2 +- .../hbase/master/procedure/LogRollProcedure.java | 178 ++++++++++++ .../master/procedure/LogRollRemoteProcedure.java | 113 ++++++++ .../master/procedure/ServerProcedureInterface.java | 5 + .../hadoop/hbase/master/procedure/ServerQueue.java | 1 + .../master/procedure/ServerRemoteProcedure.java | 3 +- .../master/procedure/SnapshotRegionProcedure.java | 2 +- .../hbase/procedure2/BaseRSProcedureCallable.java | 7 +- .../hbase/procedure2/RSProcedureCallable.java | 2 +- .../org/apache/hadoop/hbase/quotas/QuotaCache.java | 297 ++++++++------------- .../org/apache/hadoop/hbase/quotas/QuotaState.java | 38 +-- .../org/apache/hadoop/hbase/quotas/QuotaUtil.java | 163 +++++------ .../apache/hadoop/hbase/quotas/UserQuotaState.java | 22 +- .../hbase/regionserver/FlushRegionCallable.java | 3 +- .../hadoop/hbase/regionserver/HRegionServer.java | 11 +- .../hadoop/hbase/regionserver/LogRollCallable.java | 84 ++++++ .../hadoop/hbase/regionserver/RSRpcServices.java | 54 ++-- .../hbase/regionserver/ReloadQuotasCallable.java | 3 +- .../RemoteProcedureResultReporter.java | 7 +- .../hadoop/hbase/regionserver/ScannerContext.java | 16 +- .../hbase/regionserver/SnapshotRegionCallable.java | 3 +- .../hbase/regionserver/SnapshotVerifyCallable.java | 3 +- .../hbase/regionserver/SplitWALCallable.java | 3 +- .../regionserver/handler/RSProcedureHandler.java | 8 +- .../replication/master/ReplicationLogCleaner.java | 33 ++- .../ClaimReplicationQueueCallable.java | 3 +- .../regionserver/RefreshPeerCallable.java | 3 +- .../ReplaySyncReplicationWALCallable.java | 3 +- .../SwitchRpcThrottleRemoteCallable.java | 3 +- .../apache/hadoop/hbase/wal/AbstractWALRoller.java | 2 +- .../hadoop/hbase/client/TestTableScanMetrics.java | 67 ++++- .../hbase/master/MockNoopMasterServices.java | 5 + .../balancer/TestCacheAwareLoadBalancer.java | 40 +++ .../hbase/master/cleaner/TestLogsCleaner.java | 4 + .../master/procedure/TestLogRollProcedure.java | 104 ++++++++ .../procedure/TestServerRemoteProcedure.java | 3 +- .../TestRegisterPeerWorkerWhenRestarting.java | 4 +- .../hadoop/hbase/quotas/TestAtomicReadQuota.java | 1 - .../hbase/quotas/TestBlockBytesScannedQuota.java | 1 - .../quotas/TestClusterScopeQuotaThrottle.java | 1 - .../hbase/quotas/TestDefaultAtomicQuota.java | 1 - .../hbase/quotas/TestDefaultHandlerUsageQuota.java | 1 - .../hadoop/hbase/quotas/TestDefaultQuota.java | 7 +- .../apache/hadoop/hbase/quotas/TestQuotaCache.java | 40 +-- .../hadoop/hbase/quotas/TestQuotaCache2.java | 130 +++++++++ .../apache/hadoop/hbase/quotas/TestQuotaState.java | 58 +--- .../hadoop/hbase/quotas/TestQuotaThrottle.java | 1 - .../hadoop/hbase/quotas/TestQuotaUserOverride.java | 1 - .../hbase/quotas/TestThreadHandlerUsageQuota.java | 8 +- .../master/TestReplicationLogCleaner.java | 47 +++- .../hbase/rsgroup/VerifyingRSGroupAdmin.java | 5 + hbase-shaded/hbase-shaded-check-invariants/pom.xml | 19 +- .../hbase-shaded-testing-util-tester/pom.xml | 19 +- .../pom.xml | 19 +- hbase-shell/pom.xml | 19 +- hbase-shell/src/main/ruby/hbase/admin.rb | 6 + hbase-shell/src/main/ruby/shell.rb | 1 + .../src/main/ruby/shell/commands/wal_roll_all.rb | 37 +++ .../hadoop/hbase/client/AbstractTestShell.java | 14 +- .../apache/hadoop/hbase/client/BaseTestShell.java | 28 -- ...{AbstractTestShell.java => TestAdminShell.java} | 44 ++- .../hadoop/hbase/client/TestQuotasShell.java | 2 +- .../hadoop/hbase/client/TestRSGroupShell.java | 10 +- .../hadoop/hbase/client/TestReplicationShell.java | 2 +- .../org/apache/hadoop/hbase/client/TestShell.java | 2 +- .../hadoop/hbase/client/TestShellNoCluster.java | 2 + .../apache/hadoop/hbase/client/TestTableShell.java | 2 +- .../hbase/{admin_test_cluster.rb => admin_test.rb} | 0 hbase-thrift/pom.xml | 19 +- .../hadoop/hbase/thrift2/client/ThriftAdmin.java | 4 + hbase-zookeeper/pom.xml | 19 +- .../org/apache/hadoop/hbase/zookeeper/ZKUtil.java | 2 +- pom.xml | 53 ++-- src/main/asciidoc/_chapters/hbase-default.adoc | 10 + 137 files changed, 2177 insertions(+), 738 deletions(-)
