(accumulo) 01/01: Merge remote-tracking branch 'upstream/main' into elasticity

[edcoleman]

This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 4542108269fb8da4a523f1e5513974bc45ee13bd
Merge: b32a32cb58 f4c1f24658
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Wed May 8 18:01:13 2024 +0000

    Merge remote-tracking branch 'upstream/main' into elasticity

 .../accumulo/core/metrics/MetricsProducer.java     |  9 ++++
 .../apache/accumulo/tserver/BlockCacheMetrics.java | 61 ++++++++++++++++++++++
 .../org/apache/accumulo/tserver/ScanServer.java    | 18 +++----
 .../org/apache/accumulo/tserver/TabletServer.java  |  5 +-
 4 files changed, 82 insertions(+), 11 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 7f325c39fa,0590fb8aa2..8aa8f65f4b
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -166,7 -181,9 +166,8 @@@ public class TabletServer extends Abstr
    TabletServerUpdateMetrics updateMetrics;
    TabletServerScanMetrics scanMetrics;
    TabletServerMinCMetrics mincMetrics;
 -  CompactionExecutorsMetrics ceMetrics;
    PausedCompactionMetrics pausedMetrics;
+   BlockCacheMetrics blockCacheMetrics;
  
    @Override
    public TabletServerScanMetrics getScanMetrics() {
@@@ -582,14 -712,21 +583,16 @@@
      updateMetrics = new TabletServerUpdateMetrics();
      scanMetrics = new TabletServerScanMetrics();
      mincMetrics = new TabletServerMinCMetrics();
 -    ceMetrics = new CompactionExecutorsMetrics();
      pausedMetrics = new PausedCompactionMetrics();
+     blockCacheMetrics = new 
BlockCacheMetrics(this.resourceManager.getIndexCache(),
+         this.resourceManager.getDataCache(), 
this.resourceManager.getSummaryCache());
  
      metricsInfo.addMetricsProducers(this, metrics, updateMetrics, 
scanMetrics, mincMetrics,
-         pausedMetrics);
 -        ceMetrics, pausedMetrics, blockCacheMetrics);
++        pausedMetrics, blockCacheMetrics);
      metricsInfo.init();
  
 -    this.compactionManager = new CompactionManager(() -> Iterators
 -        .transform(onlineTablets.snapshot().values().iterator(), 
Tablet::asCompactable),
 -        getContext(), ceMetrics);
 -    compactionManager.start();
 -
      announceExistence();
 +    getContext().setServiceLock(tabletServerLock);
  
      try {
        walMarker.initWalMarker(getTabletSession());