Merge pull request #9800 from vespa-engine/arnej/no-flush-after-close

Arnej/no flush after close

2 files changed, 5 insertions, 9 deletions

diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
index 47a9b04291d..83d6a4a0def 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
@@ -46,11 +46,7 @@ public class LogWriter {
      * </UL>
      */
     private Writer nextWriter() throws IOException {
-
-        if (writer != null) {
-            writer.close();
-        }
-
+        close();
         int maxAttempts = 1000;
         while (maxAttempts-- > 0) {
             String name = prefix + "-" + generation++;
@@ -119,15 +115,15 @@ public class LogWriter {
     }
 
 
-    public void flush() throws IOException {
+    public synchronized void flush() throws IOException {
         if (writer != null) {
             writer.flush();
         }
     }
 
-    public void close() throws IOException {
-        flush();
+    public synchronized void close() throws IOException {
         if (writer != null) {
+            writer.flush();
             writer.close();
             writer = null;
         }
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java
index 3d692297f1c..5c1da722f57 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriterLRUCache.java
@@ -14,7 +14,7 @@ import java.util.Map;
 public class LogWriterLRUCache extends LinkedHashMap<Integer, LogWriter> {
     private static final Logger log = Logger.getLogger(LogWriterLRUCache.class.getName());
 
-    final int maxEntries = 100;
+    final int maxEntries = 5;
 
     public LogWriterLRUCache(int initialCapacity, float loadFactor) {
         super(initialCapacity, loadFactor, true);