(accumulo) 01/01: Merge branch '3.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 8f123f20831897e18ab606c998a50310c4408948
Merge: 8c54934f8b 9c10eca61d
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Wed Jan 8 20:01:01 2025 +0000

    Merge branch '3.1'

 .../accumulo/server/conf/util/ZooInfoViewer.java   |  10 +-
 .../accumulo/server/conf/util/ZooPropEditor.java   |   5 +-
 .../server/conf/util/ZooInfoViewerTest.java        |  48 +++++--
 .../accumulo/tserver/TabletClientHandler.java      |  48 ++++++-
 .../org/apache/accumulo/tserver/TabletServer.java  |   7 +-
 .../accumulo/tserver/session/UpdateSession.java    |   1 +
 .../apache/accumulo/test/CorruptMutationIT.java    | 149 +++++++++++++++++++++
 7 files changed, 246 insertions(+), 22 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 0f29d0c165,40d8886cfb..5e7f6286c5
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -377,8 -388,26 +377,13 @@@ public class TabletServer extends Abstr
      serverStopRequested = true;
    }
  
 -  private class SplitRunner implements Runnable {
 -    private final Tablet tablet;
 -
 -    public SplitRunner(Tablet tablet) {
 -      this.tablet = tablet;
 -    }
 -
 -    @Override
 -    public void run() {
 -      splitTablet(tablet);
 -    }
 -  }
 -
    public long updateTotalQueuedMutationSize(long additionalMutationSize) {
-     return totalQueuedMutationSize.addAndGet(additionalMutationSize);
+     var newTotal = totalQueuedMutationSize.addAndGet(additionalMutationSize);
+     if (log.isTraceEnabled()) {
+       log.trace("totalQueuedMutationSize is now {} after adding {}", newTotal,
+           additionalMutationSize);
+     }
+     return newTotal;
    }
  
    @Override