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

[dlmarion]

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

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

commit 5dffcd6b57a4f9e237a6c76ad54113ec5707fab8
Merge: c9d23aae5c a83f29ea1e
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Feb 5 23:27:25 2025 +0000

    Merge branch '3.1'

 .../test/functional/MemoryFreeingIterator.java     | 18 ++++-
 .../test/functional/MemoryStarvedScanIT.java       | 81 ++++++++--------------
 2 files changed, 44 insertions(+), 55 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java
index 593f254b72,88289e6db9..4f7625a734
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java
@@@ -43,22 -41,12 +41,14 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.IteratorSetting;
  import org.apache.accumulo.core.client.Scanner;
  import org.apache.accumulo.core.client.admin.TableOperations;
- import org.apache.accumulo.core.clientImpl.ClientContext;
- import org.apache.accumulo.core.clientImpl.thrift.ClientService.Client;
- import org.apache.accumulo.core.clientImpl.thrift.TInfo;
++import org.apache.accumulo.core.client.admin.servers.ServerId;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Key;
  import org.apache.accumulo.core.data.Range;
  import org.apache.accumulo.core.data.Value;
- import org.apache.accumulo.core.iterators.WrappingIterator;
- import org.apache.accumulo.core.lock.ServiceLockData;
- import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
- import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
- import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
- import org.apache.accumulo.core.rpc.ThriftUtil;
- import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+ import org.apache.accumulo.core.metadata.AccumuloTable;
++import org.apache.accumulo.core.metrics.MetricsInfo;
  import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory;
- import org.apache.accumulo.core.zookeeper.ZooCache;
  import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
  import org.apache.accumulo.harness.SharedMiniClusterBase;
  import org.apache.accumulo.minicluster.MemoryUnit;
@@@ -133,8 -119,8 +121,8 @@@ public class MemoryStarvedScanIT extend
                double val = Double.parseDouble(metric.getValue());
                SCAN_RETURNED_EARLY.add(val);
              } else if (metric.getName().equals(LOW_MEMORY.getName())) {
--              String process = metric.getTags().get("process.name");
--              if (process != null && process.contains("tserver")) {
++              String process = 
metric.getTags().get(MetricsInfo.PROCESS_NAME_TAG_KEY);
++              if (process != null && 
process.contains(ServerId.Type.TABLET_SERVER.name())) {
                  int val = Integer.parseInt(metric.getValue());
                  LOW_MEM_DETECTED.set(val);
                }