(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 09dc3ce5ac2eb8c895800a5281e747aba1c25f23
Merge: a3253f4623 e347e8b45c
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Jan 9 19:29:54 2025 +0000

    Merge branch '3.1'

 .../java/org/apache/accumulo/core/conf/Property.java    |  3 +--
 .../apache/accumulo/tserver/session/SessionManager.java | 17 +++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 7921926149,f34e331d7b..43a6792fd1
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@@ -63,9 -67,8 +63,7 @@@ public class SessionManager 
    private static final Logger log = 
LoggerFactory.getLogger(SessionManager.class);
  
    private final ConcurrentMap<Long,Session> sessions = new 
ConcurrentHashMap<>();
-   private final long maxIdle;
-   private final long maxUpdateIdle;
    private final BlockingQueue<Session> deferredCleanupQueue = new 
ArrayBlockingQueue<>(5000);
 -  private final Long expiredSessionMarker = (long) -1;
    private final ServerContext ctx;
    private volatile LongConsumer zombieCountConsumer = null;