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

[ddanielr]

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

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

commit 3c5bb40ae9a902afe40b3825fd3efc15cbd5be9a
Merge: d54b4e57bc 35d60a5a1e
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Wed Jul 24 11:55:11 2024 +0000

    Merge branch '2.1'

 .../org/apache/accumulo/server/AbstractServer.java |  11 +-
 .../org/apache/accumulo/compactor/Compactor.java   |  18 ++--
 .../org/apache/accumulo/tserver/ScanServer.java    |   4 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |   6 +-
 .../test/functional/IdleProcessMetricsIT.java      | 115 +++++++++++++++++++++
 5 files changed, 137 insertions(+), 17 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index d6cacdd19a,edfc567109..dc46e0ecd0
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@@ -18,10 -18,9 +18,9 @@@
   */
  package org.apache.accumulo.server;
  
 -import java.util.Objects;
 +import java.util.concurrent.ScheduledFuture;
  import java.util.concurrent.TimeUnit;
  import java.util.concurrent.atomic.AtomicReference;
- import java.util.function.Supplier;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.classloader.ClassLoaderUtil;