(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 cf42adff3f988ff467ff3f71449732b32703573f
Merge: 0ff1b21f2e a47e4b8601
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Jan 7 20:47:07 2025 +0000

    Merge branch '3.1'

 .../accumulo/tserver/TabletClientHandler.java      |  6 +++++
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 27 +++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
index 117d87a96d,f137a6df3b..1d13eff727
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
@@@ -397,7 -450,11 +398,11 @@@ public class TabletClientHandler implem
          us.flushTime += (t2 - pt1);
          us.commitTimes.addStat(t2 - t1);
  
 -        updateAvgCommitTime(t2 - t1, sendables.size());
 +        updateAvgCommitTime(t2 - t1, sendableMutations);
+       } catch (Exception e) {
+         TraceUtil.setException(span3, e, true);
+         log.error("Error committing mutations sent from {}", 
TServerUtils.clientAddress.get(), e);
+         throw e;
        } finally {
          span3.end();
        }
@@@ -657,9 -698,10 +662,10 @@@
        long t1 = System.currentTimeMillis();
        sendables.forEach(CommitSession::commit);
        long t2 = System.currentTimeMillis();
 -      updateAvgCommitTime(t2 - t1, sendables.size());
 +      updateAvgCommitTime(t2 - t1, sendableMutations);
      } catch (Exception e) {
        TraceUtil.setException(span3, e, true);
+       log.error("Error committing mutations sent from {}", 
TServerUtils.clientAddress.get(), e);
        throw e;
      } finally {
        span3.end();