This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch EdColeman/normalize_metrics_names in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8cf46d44f94983e2f032e53786e85938bad5227e Merge: f9b3f4230a 0e7417d036 Author: Daniel Roberts <[email protected]> AuthorDate: Thu Jul 11 15:59:22 2024 +0000 Merge remote-tracking branch 'upstream/2.1' into EdColeman/normalize_metrics_names .../accumulo/core/clientImpl/ClientContext.java | 4 +- .../core/clientImpl/ConditionalWriterImpl.java | 11 +- .../org/apache/accumulo/core/conf/Property.java | 3 + .../accumulo/core/metrics/MetricsProducer.java | 18 +-- .../spi/balancer/HostRegexTableLoadBalancer.java | 7 ++ .../core/metadata/schema/DataLevelOrderTest.java | 40 +++++++ .../org/apache/accumulo/server/AbstractServer.java | 44 ++++++- .../accumulo/server/client/BulkImporter.java | 3 +- .../accumulo/server/metrics/ProcessMetrics.java | 43 +++++++ .../org/apache/accumulo/compactor/Compactor.java | 20 ++-- .../apache/accumulo/compactor/CompactorTest.java | 3 + .../java/org/apache/accumulo/manager/Manager.java | 64 +++++++--- .../org/apache/accumulo/tserver/ScanServer.java | 4 +- .../org/apache/accumulo/tserver/TabletServer.java | 11 +- .../accumulo/tserver/tablet/CompactableImpl.java | 2 +- .../apache/accumulo/test/ConditionalWriterIT.java | 33 ++++++ .../compaction/ExternalCompactionProgressIT.java | 23 +--- .../test/functional/IdleProcessMetricsIT.java | 130 +++++++++++++++++++++ .../apache/accumulo/test/metrics/MetricsIT.java | 2 +- 19 files changed, 400 insertions(+), 65 deletions(-)
