(accumulo) 01/01: Merge remote-tracking branch 'upstream/2.1'

[domgarguilo]

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

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

commit 33e2d055af6187ca88389c27a4917869773447e6
Merge: d46ef7cdc6 7f9d3f3efe
Author: Dom Garguilo <domgargu...@apache.org>
AuthorDate: Tue May 7 16:17:02 2024 -0400

    Merge remote-tracking branch 'upstream/2.1'
    
    # Conflicts:
    #       
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
    #       
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

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

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index 44ab680a98,dabcc617d1..91d7fdb9b5
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@@ -383,8 -381,10 +384,10 @@@ public class ScanServer extends Abstrac
  
      scanMetrics = new TabletServerScanMetrics();
      scanServerMetrics = new ScanServerMetrics(tabletMetadataCache);
+     blockCacheMetrics = new BlockCacheMetrics(resourceManager.getIndexCache(),
+         resourceManager.getDataCache(), resourceManager.getSummaryCache());
  
-     metricsInfo.addMetricsProducers(this, scanMetrics, scanServerMetrics);
 -    metricsInfo.addMetricsProducers(scanMetrics, scanServerMetrics, 
blockCacheMetrics);
++    metricsInfo.addMetricsProducers(this, scanMetrics, scanServerMetrics, 
blockCacheMetrics);
      metricsInfo.init();
      // We need to set the compaction manager so that we don't get an NPE in 
CompactableImpl.close
  
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 409d1ecada,85b0872385..0590fb8aa2
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -182,7 -187,7 +182,8 @@@ public class TabletServer extends Abstr
    TabletServerScanMetrics scanMetrics;
    TabletServerMinCMetrics mincMetrics;
    CompactionExecutorsMetrics ceMetrics;
 +  PausedCompactionMetrics pausedMetrics;
+   BlockCacheMetrics blockCacheMetrics;
  
    @Override
    public TabletServerScanMetrics getScanMetrics() {
@@@ -712,10 -768,11 +713,12 @@@
      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(metrics, updateMetrics, scanMetrics, 
mincMetrics, ceMetrics,
 -        blockCacheMetrics);
 +    metricsInfo.addMetricsProducers(this, metrics, updateMetrics, 
scanMetrics, mincMetrics,
-         ceMetrics, pausedMetrics);
++        ceMetrics, pausedMetrics, blockCacheMetrics);
      metricsInfo.init();
  
      this.compactionManager = new CompactionManager(() -> Iterators