This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 8da73ce467 Merge branch '2.1' add c488f788ad scan server metrics from #4458 based on #4459 (#4461) add 96b86a5f62 Update scan server metrics for file reservations (#4522) new 46ed92329c Merge remote-tracking branch 'upstream/2.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accumulo/core/metrics/MetricsProducer.java | 108 +++++++++++---------- .../org/apache/accumulo/tserver/ScanServer.java | 55 +++++++++-- .../apache/accumulo/tserver/ScanServerMetrics.java | 59 +++++++++++ .../accumulo/tserver/ThriftScanClientHandler.java | 4 +- .../tserver/metrics/TabletServerScanMetrics.java | 24 +++-- .../apache/accumulo/tserver/ScanServerTest.java | 9 ++ .../apache/accumulo/test/metrics/MetricsIT.java | 11 ++- 7 files changed, 192 insertions(+), 78 deletions(-) create mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServerMetrics.java