[GitHub] keith-turner closed pull request #389: ACCUMULO-4805 Optimize file manager when no files to open

[GitBox <gi...@apache.org>]

keith-turner closed pull request #389: ACCUMULO-4805 Optimize file manager when no files to open
URL: https://github.com/apache/accumulo/pull/389
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 2aaad39ccd..983323258a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@ -245,10 +245,8 @@ private void closeReaders(Collection<FileSKVIterator> filesToClose) {
   }
 
   private List<String> takeOpenFiles(Collection<String> files, Map<FileSKVIterator,String> readersReserved) {
-    List<String> filesToOpen = new LinkedList<>(files);
-    for (Iterator<String> iterator = filesToOpen.iterator(); iterator.hasNext();) {
-      String file = iterator.next();
-
+    List<String> filesToOpen = Collections.emptyList();
+    for (String file : files) {
       List<OpenReader> ofl = openFiles.get(file);
       if (ofl != null && ofl.size() > 0) {
         OpenReader openReader = ofl.remove(ofl.size() - 1);
@@ -256,9 +254,12 @@ private void closeReaders(Collection<FileSKVIterator> filesToClose) {
         if (ofl.size() == 0) {
           openFiles.remove(file);
         }
-        iterator.remove();
+      } else {
+        if (filesToOpen.isEmpty()) {
+          filesToOpen = new ArrayList<>(files.size());
+        }
+        filesToOpen.add(file);
       }
-
     }
     return filesToOpen;
   }
@@ -291,10 +292,12 @@ private void closeReaders(Collection<FileSKVIterator> filesToClose) {
 
       filesToOpen = takeOpenFiles(files, readersReserved);
 
-      int numOpen = countReaders(openFiles);
+      if (!filesToOpen.isEmpty()) {
+        int numOpen = countReaders(openFiles);
 
-      if (filesToOpen.size() + numOpen + reservedReaders.size() > maxOpen) {
-        filesToClose = takeLRUOpenFiles((filesToOpen.size() + numOpen + reservedReaders.size()) - maxOpen);
+        if (filesToOpen.size() + numOpen + reservedReaders.size() > maxOpen) {
+          filesToClose = takeLRUOpenFiles((filesToOpen.size() + numOpen + reservedReaders.size()) - maxOpen);
+        }
       }
     }
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services