(accumulo) 01/01: Merge branch '3.1'

[kturner]

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

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

commit ff5f71c557c81403fe39ce2af38356e0428d41b3
Merge: 94167151e2 9b22be23d5
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Wed Oct 23 21:25:36 2024 +0000

    Merge branch '3.1'

 .../org/apache/accumulo/server/fs/FileManager.java    |  4 ++++
 .../java/org/apache/accumulo/tserver/ScanServer.java  |  2 +-
 .../org/apache/accumulo/tserver/TabletServer.java     |  2 +-
 .../accumulo/tserver/TabletServerResourceManager.java |  4 ++++
 .../tserver/metrics/TabletServerScanMetrics.java      | 19 +++++++------------
 .../accumulo/tserver/tablet/ScanDataSource.java       |  3 ---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index 4dc21eb487,d5eef0321c..927570ee6b
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@@ -408,9 -404,10 +408,9 @@@ public class ScanServer extends Abstrac
      }
  
      MetricsInfo metricsInfo = getContext().getMetricsInfo();
 -    metricsInfo.addServiceTags(getApplicationName(), clientAddress);
 -    metricsInfo.addCommonTags(List.of(Tag.of("resource.group", groupName)));
 +    metricsInfo.addServiceTags(getApplicationName(), clientAddress, 
getResourceGroup());
  
-     scanMetrics = new TabletServerScanMetrics();
+     scanMetrics = new TabletServerScanMetrics(resourceManager::getOpenFiles);
      sessionManager.setZombieCountConsumer(scanMetrics::setZombieScanThreads);
      scanServerMetrics = new ScanServerMetrics(tabletMetadataCache);
      blockCacheMetrics = new BlockCacheMetrics(resourceManager.getIndexCache(),
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 5cb59315fe,66bfa51592..5e26d5a6a4
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -581,13 -703,15 +581,13 @@@ public class TabletServer extends Abstr
        throw new RuntimeException("Failed to start the tablet client service", 
e1);
      }
  
 -    MetricsInfo metricsInfo = context.getMetricsInfo();
 -    metricsInfo.addServiceTags(getApplicationName(), clientAddress);
 -
 +    MetricsInfo metricsInfo = getContext().getMetricsInfo();
 +    metricsInfo.addServiceTags(getApplicationName(), clientAddress, 
getResourceGroup());
      metrics = new TabletServerMetrics(this);
      updateMetrics = new TabletServerUpdateMetrics();
-     scanMetrics = new TabletServerScanMetrics();
+     scanMetrics = new 
TabletServerScanMetrics(this.resourceManager::getOpenFiles);
      sessionManager.setZombieCountConsumer(scanMetrics::setZombieScanThreads);
      mincMetrics = new TabletServerMinCMetrics();
 -    ceMetrics = new CompactionExecutorsMetrics();
      pausedMetrics = new PausedCompactionMetrics();
      blockCacheMetrics = new 
BlockCacheMetrics(this.resourceManager.getIndexCache(),
          this.resourceManager.getDataCache(), 
this.resourceManager.getSummaryCache());