(accumulo) branch 3.1 updated (d3c54640cc -> 17c69d7df3)

[kt...@apache.org]

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

kturner pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from d3c54640cc Merge branch '2.1' into 3.1
     add 5847052ce7 Makes CompactionExecutorsMetrics.registry volatile (#5379)
     add b5948f954c uses try w/ resources to close rfile block (#5381)
     new 17c69d7df3 Merge branch '2.1' into 3.1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/file/blockfile/impl/CachableBlockFile.java | 21 ++++++++++-----------
 .../tserver/metrics/CompactionExecutorsMetrics.java |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

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

[kt...@apache.org]

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

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

commit 17c69d7df38fd4cf0c59a0f30bba3dc3d09b7bf7
Merge: d3c54640cc b5948f954c
Author: Keith Turner <kt...@apache.org>
AuthorDate: Thu Mar 6 16:55:30 2025 +0000

    Merge branch '2.1' into 3.1

 .../core/file/blockfile/impl/CachableBlockFile.java | 21 ++++++++++-----------
 .../tserver/metrics/CompactionExecutorsMetrics.java |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 5041f15d98,d33f3d1bb6..82baa9af9e
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@@ -47,8 -48,10 +47,10 @@@ import org.apache.hadoop.fs.Seekable
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 -import com.google.common.cache.Cache;
 +import com.github.benmanes.caffeine.cache.Cache;
  
+ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+ 
  /**
   * This is a wrapper class for BCFile that includes a cache for independent caches for datablocks
   * and metadatablocks