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 741199d5035d9bb2dcc59e28e2ddf60bde5c8056 Merge: 3795b399e20 5b4efe69953 Author: Viraj Jasani <[email protected]> AuthorDate: Wed Sep 3 22:11:28 2025 -0700 Merge branch 'master' into HBASE-29368-key-management-feature .../FanOutOneBlockAsyncDFSOutputHelper.java | 3 +- .../io/asyncfs/monitor/ExcludeDatanodeManager.java | 31 +- .../io/asyncfs/monitor/StreamSlowMonitor.java | 3 +- .../org/apache/hadoop/hbase/client/Append.java | 9 +- .../hbase/client/AsyncNonMetaRegionLocator.java | 78 +- .../hadoop/hbase/client/AsyncRegionLocator.java | 2 +- .../main/java/org/apache/hadoop/hbase/TagType.java | 2 + hbase-examples/pom.xml | 14 +- .../example/ZooKeeperScanPolicyObserver.java | 121 +-- hbase-http/pom.xml | 6 +- .../hadoop/hbase/http/AdminAuthorizedServlet.java | 2 +- .../org/apache/hadoop/hbase/http/HttpServer.java | 53 +- .../apache/hadoop/hbase/http/HttpServerUtil.java | 12 +- .../org/apache/hadoop/hbase/http/InfoServer.java | 2 +- .../hadoop/hbase/http/ProfileOutputServlet.java | 2 +- .../org/apache/hadoop/hbase/http/log/LogLevel.java | 7 +- .../hbase/http/log/LogLevelExceptionUtils.java | 100 +++ .../apache/hadoop/hbase/http/TestHttpServer.java | 5 +- .../hadoop/hbase/http/conf/TestConfServlet.java | 2 +- .../apache/hadoop/hbase/http/log/TestLogLevel.java | 5 +- .../hadoop/hbase/http/resource/JerseyResource.java | 2 +- .../hadoop/hbase/IntegrationTestBackupRestore.java | 32 +- .../org/apache/hadoop/hbase/MockHttpApiRule.java | 65 +- .../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 4 +- .../TestHFileOutputFormat2WithSecurity.java | 131 ++++ .../hbase/mapreduce/TestTableMapReduceUtil.java | 44 +- .../org/apache/hadoop/hbase/rest/RESTServer.java | 24 +- .../hadoop/hbase/rest/TestGetAndPutResource.java | 5 + .../hadoop/hbase/rest/client/TestRemoteTable.java | 25 + .../apache/hadoop/hbase/io/hfile/BlockCache.java | 21 +- .../hadoop/hbase/io/hfile/BlockCacheKey.java | 1 - .../apache/hadoop/hbase/io/hfile/CacheConfig.java | 13 + .../hadoop/hbase/io/hfile/CombinedBlockCache.java | 21 +- .../org/apache/hadoop/hbase/io/hfile/HFile.java | 12 + .../apache/hadoop/hbase/io/hfile/HFileInfo.java | 6 + .../hadoop/hbase/io/hfile/HFilePreadReader.java | 2 + .../hadoop/hbase/io/hfile/HFileReaderImpl.java | 10 +- .../hadoop/hbase/io/hfile/HFileWriterImpl.java | 60 ++ .../hadoop/hbase/io/hfile/bucket/BucketCache.java | 58 +- .../apache/hadoop/hbase/ipc/SimpleRpcServer.java | 3 +- .../org/apache/hadoop/hbase/master/HMaster.java | 15 +- .../hadoop/hbase/master/cleaner/LogCleaner.java | 7 + .../master/procedure/CreateTableProcedure.java | 3 + .../master/procedure/ModifyTableProcedure.java | 2 + .../hbase/master/procedure/SnapshotProcedure.java | 5 +- .../org/apache/hadoop/hbase/quotas/QuotaCache.java | 204 ++--- .../hadoop/hbase/regionserver/CellTSTiering.java | 57 ++ .../regionserver/CustomTieredStoreEngine.java | 56 ++ .../hadoop/hbase/regionserver/CustomTiering.java | 58 ++ .../regionserver/CustomTieringMultiFileWriter.java | 85 ++ .../hadoop/hbase/regionserver/DataTiering.java | 22 +- .../hbase/regionserver/DataTieringException.java | 22 +- .../hbase/regionserver/DataTieringManager.java | 321 ++++++++ .../hadoop/hbase/regionserver/DataTieringType.java | 28 +- .../regionserver/DateTieredMultiFileWriter.java | 20 +- .../hbase/regionserver/DateTieredStoreEngine.java | 20 +- .../apache/hadoop/hbase/regionserver/HRegion.java | 4 +- .../hbase/regionserver/HRegionFileSystem.java | 25 + .../hadoop/hbase/regionserver/HRegionServer.java | 4 + .../MetricsRegionServerWrapperImpl.java | 5 +- .../hadoop/hbase/regionserver/StoreFileWriter.java | 32 +- .../hbase/regionserver/TimeRangeTracker.java | 4 +- .../hbase/regionserver/compactions/Compactor.java | 6 + .../compactions/CustomCellTieredUtils.java | 49 ++ .../CustomCellTieringValueProvider.java | 87 ++ .../CustomDateTieredCompactionPolicy.java | 155 ++++ .../compactions/CustomTieredCompactor.java | 74 ++ .../compactions/DateTieredCompactionPolicy.java | 129 +-- .../compactions/DateTieredCompactor.java | 12 +- .../hadoop/hbase/util/TableDescriptorChecker.java | 36 + .../main/resources/hbase-webapps/master/hbck.jsp | 24 +- .../main/resources/hbase-webapps/master/table.jsp | 20 + .../org/apache/hadoop/hbase/HBaseTestingUtil.java | 39 + .../client/TestAsyncNonMetaRegionLocator.java | 2 +- ...stAsyncNonMetaRegionLocatorConcurrenyLimit.java | 2 +- .../hbase/client/TestAsyncTableLocatePrefetch.java | 3 +- .../hbase/client/TestIllegalTableDescriptor.java | 45 ++ .../hbase/client/TestRegionLocationCaching.java | 107 +++ .../hadoop/hbase/io/hfile/TestBytesReadFromFs.java | 4 + .../TestHFileInlineToRootChunkConversion.java | 3 +- .../apache/hadoop/hbase/ipc/TestServerCall.java | 10 +- .../master/procedure/TestSnapshotProcedure.java | 3 + .../TestSnapshotProcedureForSnapshotType.java | 92 +++ .../hbase/quotas/TestDefaultAtomicQuota.java | 9 - .../apache/hadoop/hbase/quotas/TestQuotaCache.java | 118 ++- .../TestCustomCellDataTieringManager.java | 865 ++++++++++++++++++++ .../TestCustomCellTieredCompactionPolicy.java | 275 +++++++ .../hbase/regionserver/TestDataTieringManager.java | 871 +++++++++++++++++++++ .../compactions/TestCustomCellTieredCompactor.java | 148 ++++ .../hbase/security/AbstractTestMutualTls.java | 16 +- .../resources/ensure-jars-have-correct-contents.sh | 2 + .../shaded/org/eclipse/jetty/webapp/webdefault.xml | 550 ------------- .../resources/ensure-jars-have-correct-contents.sh | 2 + .../hadoop/hbase/client/AbstractTestShell.java | 100 +-- .../{TestAdminShell.java => BaseTestShell.java} | 21 +- .../{AbstractTestShell.java => RubyShellTest.java} | 85 +- .../hadoop/hbase/client/TestChangeSftShell.java | 46 -- .../hadoop/hbase/client/TestListTablesShell.java | 12 +- .../hadoop/hbase/client/TestQuotasShell.java | 5 +- .../hadoop/hbase/client/TestRSGroupShell.java | 15 +- .../hadoop/hbase/client/TestReplicationShell.java | 5 +- .../org/apache/hadoop/hbase/client/TestShell.java | 8 +- .../hadoop/hbase/client/TestShellNoCluster.java | 41 +- .../apache/hadoop/hbase/client/TestTableShell.java | 5 +- .../{admin2_test.rb => admin2_test_cluster.rb} | 0 .../hbase/{admin_test.rb => admin_test_cluster.rb} | 0 ...tils_test.rb => balancer_utils_test_cluster.rb} | 0 ...no_cluster.rb => connection_test_no_cluster.rb} | 0 .../hbase/{hbase_test.rb => hbase_test_cluster.rb} | 0 ...dmin_test.rb => security_admin_test_cluster.rb} | 0 ...monitor_test.rb => taskmonitor_test_cluster.rb} | 0 ....rb => visibility_labels_admin_test_cluster.rb} | 0 .../src/test/ruby/no_cluster_tests_runner.rb | 94 --- .../{commands_test.rb => commands_test_cluster.rb} | 0 ...converter_test.rb => converter_test_cluster.rb} | 0 ...formatter_test.rb => formatter_test_cluster.rb} | 0 .../{shell_test.rb => general_test_cluster.rb} | 0 ...st_locks_test.rb => list_locks_test_cluster.rb} | 0 ...res_test.rb => list_procedures_test_cluster.rb} | 0 ...tive_test.rb => noninteractive_test_cluster.rb} | 0 ...nge_shell_test.rb => sftchange_test_cluster.rb} | 0 hbase-shell/src/test/ruby/tests_runner.rb | 37 +- .../apache/hadoop/hbase/thrift/ThriftServer.java | 4 +- .../hbase/thrift/generated/AlreadyExists.java | 2 +- .../hbase/thrift/generated/BatchMutation.java | 2 +- .../hbase/thrift/generated/ColumnDescriptor.java | 2 +- .../hadoop/hbase/thrift/generated/Hbase.java | 2 +- .../hadoop/hbase/thrift/generated/IOError.java | 2 +- .../hbase/thrift/generated/IllegalArgument.java | 2 +- .../hadoop/hbase/thrift/generated/Mutation.java | 2 +- .../thrift/generated/TAccessControlEntity.java | 2 +- .../hadoop/hbase/thrift/generated/TAppend.java | 2 +- .../hadoop/hbase/thrift/generated/TCell.java | 2 +- .../hadoop/hbase/thrift/generated/TColumn.java | 2 +- .../hadoop/hbase/thrift/generated/TIncrement.java | 2 +- .../hbase/thrift/generated/TPermissionScope.java | 2 +- .../hadoop/hbase/thrift/generated/TRegionInfo.java | 2 +- .../hadoop/hbase/thrift/generated/TRowResult.java | 2 +- .../hadoop/hbase/thrift/generated/TScan.java | 2 +- .../hbase/thrift/generated/TThriftServerType.java | 2 +- .../hadoop/hbase/thrift2/ThriftUtilities.java | 4 + .../thrift2/generated/TAccessControlEntity.java | 2 +- .../hadoop/hbase/thrift2/generated/TAppend.java | 2 +- .../hbase/thrift2/generated/TAuthorization.java | 2 +- .../hbase/thrift2/generated/TBloomFilterType.java | 2 +- .../hbase/thrift2/generated/TCellVisibility.java | 2 +- .../hadoop/hbase/thrift2/generated/TColumn.java | 2 +- .../thrift2/generated/TColumnFamilyDescriptor.java | 2 +- .../hbase/thrift2/generated/TColumnIncrement.java | 2 +- .../hbase/thrift2/generated/TColumnValue.java | 2 +- .../hbase/thrift2/generated/TCompareOperator.java | 2 +- .../thrift2/generated/TCompressionAlgorithm.java | 2 +- .../hbase/thrift2/generated/TConsistency.java | 2 +- .../thrift2/generated/TDataBlockEncoding.java | 2 +- .../hadoop/hbase/thrift2/generated/TDelete.java | 122 ++- .../hbase/thrift2/generated/TDeleteType.java | 2 +- .../hbase/thrift2/generated/TDurability.java | 2 +- .../hbase/thrift2/generated/TFilterByOperator.java | 2 +- .../hadoop/hbase/thrift2/generated/TGet.java | 2 +- .../hbase/thrift2/generated/THBaseService.java | 2 +- .../hbase/thrift2/generated/THRegionInfo.java | 2 +- .../hbase/thrift2/generated/THRegionLocation.java | 2 +- .../hadoop/hbase/thrift2/generated/TIOError.java | 2 +- .../hbase/thrift2/generated/TIllegalArgument.java | 2 +- .../hadoop/hbase/thrift2/generated/TIncrement.java | 2 +- .../hbase/thrift2/generated/TKeepDeletedCells.java | 2 +- .../hbase/thrift2/generated/TLogQueryFilter.java | 2 +- .../hadoop/hbase/thrift2/generated/TLogType.java | 2 +- .../hadoop/hbase/thrift2/generated/TMutation.java | 2 +- .../thrift2/generated/TNamespaceDescriptor.java | 2 +- .../hbase/thrift2/generated/TOnlineLogRecord.java | 2 +- .../hbase/thrift2/generated/TPermissionScope.java | 2 +- .../hadoop/hbase/thrift2/generated/TPut.java | 2 +- .../hadoop/hbase/thrift2/generated/TReadType.java | 2 +- .../hadoop/hbase/thrift2/generated/TResult.java | 2 +- .../hbase/thrift2/generated/TRowMutations.java | 2 +- .../hadoop/hbase/thrift2/generated/TScan.java | 2 +- .../hbase/thrift2/generated/TServerName.java | 2 +- .../hbase/thrift2/generated/TTableDescriptor.java | 2 +- .../hadoop/hbase/thrift2/generated/TTableName.java | 2 +- .../hbase/thrift2/generated/TThriftServerType.java | 2 +- .../hadoop/hbase/thrift2/generated/TTimeRange.java | 2 +- .../org/apache/hadoop/hbase/thrift2/hbase.thrift | 3 +- .../TestThriftHBaseServiceHandlerWithLabels.java | 89 +++ pom.xml | 75 +- 185 files changed, 5134 insertions(+), 1506 deletions(-)
