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

[kturner]

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 aab174e83bf64a9c9fa58b3a432282bab7fbb07d
Merge: 545eef2d83 5370513fb5
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Oct 28 21:28:30 2024 +0000

    Merge branch '2.1' into 3.1

 .../org/apache/accumulo/server/fs/FileManager.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java
index 2bead5e20c,b2f9daeccd..59ac2484af
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/FileManager.java
@@@ -352,19 -366,11 +361,10 @@@ public class FileManager 
          throw new IllegalArgumentException("Asked to release readers that 
were never reserved ");
        }
  
-       for (FileSKVIterator reader : readers) {
-         try {
-           reader.closeDeepCopies();
-         } catch (IOException e) {
-           log.warn("{}", e.getMessage(), e);
-           sawIOException = true;
-         }
-       }
- 
        for (FileSKVIterator reader : readers) {
 -        String fileName = reservedReaders.remove(reader);
 +        StoredTabletFile file = reservedReaders.remove(reader);
          if (!sawIOException) {
 -          openFiles.computeIfAbsent(fileName, k -> new ArrayList<>())
 -              .add(new OpenReader(fileName, reader));
 +          openFiles.computeIfAbsent(file, k -> new ArrayList<>()).add(new 
OpenReader(file, reader));
          }
        }
      }