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 4e73e8ad346e3db85f55b279b207b802db7b2a44 Merge: bad5c8fe4fc e57552521e2 Author: Viraj Jasani <[email protected]> AuthorDate: Mon Oct 13 23:40:14 2025 -0700 Merge branch 'master' into HBASE-29368-key-management-feature .../hadoop/hbase/backup/BackupHFileCleaner.java | 17 +- .../backup/impl/IncrementalTableBackupClient.java | 38 +- .../mapreduce/MapReduceHFileSplitterJob.java | 36 +- .../hbase/backup/TestBackupHFileCleaner.java | 13 +- .../backup/TestIncrementalBackupWithBulkLoad.java | 96 ++ .../apache/hadoop/hbase/HBaseJupiterExtension.java | 70 +- ...nitListener.java => JUnitResourceCheckers.java} | 74 +- .../hadoop/hbase/ResourceCheckerJUnitListener.java | 114 +- .../hbase/TestBuildThreadDiagnosticString.java | 27 +- .../apache/hadoop/hbase/TimedOutTestsListener.java | 19 +- ...fferUtils.java => ByteBufferUtilsTestBase.java} | 184 +-- .../util/{TestBytes.java => BytesTestBase.java} | 177 +-- .../hadoop/hbase/util/TestByteBufferUtils.java | 652 +---------- .../hbase/util/TestByteBufferUtilsWoUnsafe.java | 43 + .../org/apache/hadoop/hbase/util/TestBytes.java | 613 +--------- .../hadoop/hbase/util/TestBytesWoUnsafe.java | 41 + .../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 32 +- .../hbase/mapreduce/KeyOnlyCellComparable.java | 94 ++ .../hbase/mapreduce/PreSortedCellsReducer.java | 47 + .../apache/hadoop/hbase/mapreduce/WALPlayer.java | 38 +- .../hadoop/hbase/mapreduce/TestWALPlayer.java | 126 ++- hbase-server/pom.xml | 5 + .../tmpl/master/AssignmentManagerStatusTmpl.jamon | 128 --- .../hbase/tmpl/master/BackupMasterStatusTmpl.jamon | 70 -- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 800 ------------- .../hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon | 393 ------- .../hbase/tmpl/master/RegionServerListTmpl.jamon | 538 --------- .../hbase/tmpl/master/RegionVisualizerTmpl.jamon | 119 -- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 2 +- .../hadoop/hbase/coprocessor/RegionObserver.java | 16 + .../apache/hadoop/hbase/io/hfile/CacheConfig.java | 66 +- .../org/apache/hadoop/hbase/io/hfile/HFile.java | 4 +- .../hadoop/hbase/io/hfile/HFileReaderImpl.java | 26 + .../java/org/apache/hadoop/hbase/ipc/RpcCall.java | 4 - .../org/apache/hadoop/hbase/ipc/RpcServer.java | 6 +- .../org/apache/hadoop/hbase/ipc/ServerCall.java | 11 - .../master/cleaner/BaseFileCleanerDelegate.java | 4 + .../hbase/master/cleaner/FileCleanerDelegate.java | 4 + .../hbase/master/http/MasterStatusConstants.java} | 28 +- .../hbase/master/http/MasterStatusServlet.java | 62 +- ...terStatusServlet.java => MasterStatusUtil.java} | 78 +- .../hadoop/hbase/master/http/RegionVisualizer.java | 2 +- .../ThreadLocalServerSideScanMetrics.java | 23 +- .../org/apache/hadoop/hbase/quotas/QuotaCache.java | 2 +- .../hbase/quotas/RegionServerRpcQuotaManager.java | 4 +- .../apache/hadoop/hbase/regionserver/HRegion.java | 13 + .../hadoop/hbase/regionserver/RSRpcServices.java | 32 +- .../hbase/regionserver/RegionCoprocessorHost.java | 25 + .../hbase/regionserver/RegionScannerImpl.java | 26 - .../master/assignmentManagerStatus.jsp | 117 ++ .../hbase-webapps/master/backupMasterStatus.jsp | 66 ++ .../hbase-webapps/master/catalogTables.jsp | 82 ++ .../hbase-webapps/master/deadRegionServers.jsp | 89 ++ .../main/resources/hbase-webapps/master/header.jsp | 4 +- .../main/resources/hbase-webapps/master/index.html | 2 +- .../main/resources/hbase-webapps/master/master.jsp | 144 ++- .../resources/hbase-webapps/master/peerConfigs.jsp | 86 ++ .../hbase-webapps/master/regionServerList.jsp | 90 ++ .../master/regionServerListBaseStats.jsp | 127 +++ .../master/regionServerListCompactionStats.jsp | 78 ++ .../{master.jsp => regionServerListEmptyStat.jsp} | 20 +- .../master/regionServerListMemoryStats.jsp | 90 ++ .../master/regionServerListReplicationStats.jsp | 90 ++ .../master/regionServerListRequestStats.jsp | 75 ++ .../master/regionServerListStoreStats.jsp | 108 ++ .../hbase-webapps/master/regionVisualizer.jsp | 120 ++ .../main/resources/hbase-webapps/master/rits.jsp | 6 +- .../resources/hbase-webapps/master/rsGroupList.jsp | 78 ++ .../hbase-webapps/master/rsGroupListBaseStats.jsp | 103 ++ .../master/rsGroupListCompactStats.jsp | 73 ++ .../master/rsGroupListMemoryStats.jsp | 85 ++ .../master/rsGroupListRequestStats.jsp | 66 ++ .../hbase-webapps/master/rsGroupListStoreStats.jsp | 102 ++ .../hbase-webapps/master/softwareAttributes.jsp | 173 +++ .../hbase-webapps/master/tablesDetailed.jsp | 9 +- .../resources/hbase-webapps/master/taskMonitor.jsp | 90 ++ .../master/taskMonitorRenderTasks.jsp | 87 ++ .../resources/hbase-webapps/master/userTables.jsp | 115 ++ .../resources/hbase-webapps/master/warnings.jsp | 87 ++ .../hbase-webapps/static/js/masterStatusInit.js | 126 +++ .../apache/hadoop/hbase/TestHBaseTestingUtil.java | 37 - .../org/apache/hadoop/hbase/TestInfoServers.java | 5 +- .../org/apache/hadoop/hbase/TestPortAllocator.java | 67 ++ ...ientSide3.java => FromClientSide3TestBase.java} | 134 +-- .../hadoop/hbase/client/TestFromClientSide3.java | 1183 +------------------- .../hbase/client/TestScannersFromClientSide.java | 2 +- .../coprocessor/SampleRegionWALCoprocessor.java | 32 + .../hbase/coprocessor/SimpleRegionObserver.java | 36 + .../coprocessor/TestRegionObserverInterface.java | 45 +- .../hadoop/hbase/coprocessor/TestWALObserver.java | 2 + .../hadoop/hbase/io/hfile/TestCacheConfig.java | 21 +- .../hadoop/hbase/io/hfile/TestHFileReaderImpl.java | 22 + .../hbase/ipc/TestProtobufRpcServiceImpl.java | 66 +- .../hbase/master/http/TestMasterStatusPage.java | 187 ++++ .../hbase/master/http/TestMasterStatusServlet.java | 152 --- .../hbase/master/http/TestMasterStatusUtil.java | 255 +++++ .../hbase/namequeues/TestNamedQueueRecorder.java | 10 - .../hadoop/hbase/namequeues/TestRpcLogDetails.java | 10 - .../store/region/TestRegionProcedureStore.java | 10 - .../hbase/security/access/TestRpcAccessChecks.java | 5 +- .../hbase/util/TestFromClientSide3WoUnsafe.java | 42 +- pom.xml | 70 +- src/main/asciidoc/_chapters/backup_restore.adoc | 92 +- ....properties => project-info-reports.properties} | 194 ++-- src/site/resources/css/site.css | 103 +- src/site/resources/js/searchform.js | 48 + src/site/site.xml | 111 +- src/site/xdoc/documentation-1.4.xml | 37 + src/site/xdoc/documentation-2.3.xml | 39 + src/site/xdoc/documentation-2.4.xml | 39 + src/site/xdoc/documentation-2.5.xml | 37 + src/site/xdoc/documentation-2.6.xml | 37 + src/site/xdoc/index.xml | 4 +- 113 files changed, 4928 insertions(+), 5836 deletions(-) diff --cc hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java index 6392b36ef12,7080a865aa6..56e927dfcc8 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java @@@ -40,10 -40,7 +40,10 @@@ import org.apache.hadoop.hbase.io.Metri import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.ReaderContext.ReaderType; - import org.apache.hadoop.hbase.ipc.RpcServer; +import org.apache.hadoop.hbase.keymeta.KeyManagementService; +import org.apache.hadoop.hbase.keymeta.ManagedKeyDataCache; +import org.apache.hadoop.hbase.keymeta.SystemKeyCache; + import org.apache.hadoop.hbase.monitoring.ThreadLocalServerSideScanMetrics; import org.apache.hadoop.hbase.regionserver.CellSink; import org.apache.hadoop.hbase.regionserver.ShipperListener; import org.apache.hadoop.hbase.regionserver.TimeRangeTracker;
