Changeset 8a001ad

Timestamp:

Apr 6, 2019 3:25:37 PM (2 years ago)

Author:

zab2 <zab2@…>

Branches:

master

Children:

904bf2a

Parents:

2c602fa

Message:

Move all disk i/o to a single thread to prevent very rare errors when running multiple tunnels

File:

• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/AccessFilter.java (modified) (6 diffs)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/AccessFilter.java

@@ -7 +7 @@
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
 
 import java.io.File;
@@ -42 +44 @@
     private static final long SYNC_INTERVAL = 10 * 1000;
 
+    /**
+     * All disk i/o from all instances of this filter
+     * happen on this thread (apart from initial load)
+     */
+    private static final ExecutorService DISK_WRITER = Executors.newSingleThreadExecutor();
+
     private final FilterDefinition definition;
     private final I2PAppContext context;
@@ -55 +63 @@
      */
     private final Map<Hash, DestTracker> unknownDests = new HashMap<Hash, DestTracker>();
+
+    private volatile Syncer syncer;
 
     /**
@@ -73 +83 @@
         if (timersRunning.compareAndSet(false, true)) {
             new Purger();
-            new Syncer();
+            syncer = new Syncer();
         }
     }
@@ -80 +90 @@
     public void stop() {
         timersRunning.set(false);
+        syncer = null;
     }
 
@@ -201 +212 @@
             if (!timersRunning.get())
                 return;
-            try {
-                record();
-                reload();
-                schedule(SYNC_INTERVAL);
-            } catch (IOException bad) {
-                Log log = context.logManager().getLog(AccessFilter.class);
-                log.log(Log.CRIT, "syncing access list failed", bad);
-            }
-        }
+            DISK_WRITER.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        record();
+                        reload();
+                        Syncer syncer = AccessFilter.this.syncer;
+                        if (syncer != null) 
+                            syncer.schedule(SYNC_INTERVAL);
+                    } catch (IOException bad) {
+                        Log log = context.logManager().getLog(AccessFilter.class);
+                       log.log(Log.CRIT, "syncing access list failed", bad);
+                    }
+                }
+            });
+         }   
     }
 }