Changeset 1caf3e7

Timestamp:

Apr 21, 2015 2:22:05 PM (6 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

b67bbd70

Parents:

fd82fff

Message:

Router timestamper:

• Add country-to-continent mapping
• Add continent pool.ntp.org zones as first fallback, this will improve time service for countries that don't have a zone
• Don't start threads in constructors
• Fix logging, better prevention of initialization loops
• Log severe errors to wrapper log also

continent.txt file from ​http://dev.maxmind.com/geoip/legacy/codes/country_continent/
Creative Commons Attribution-ShareAlike? 3.0 Unported License
​http://dev.maxmind.com/geoip/legacy/geolite/
Terms already met in LICENSE.txt

Files:

• build.xml (modified) (2 diffs)
• installer/resources/continents.txt (added)
• router/java/src/net/i2p/router/RouterClock.java (modified) (3 diffs)
• router/java/src/net/i2p/router/RouterContext.java (modified) (1 diff)
• router/java/src/net/i2p/router/time/RouterTimestamper.java (modified) (14 diffs)
• router/java/src/net/i2p/router/time/Zones.java (added)
• router/java/src/net/i2p/router/transport/GeoIP.java (modified) (1 diff)

build.xml

@@ -1406 +1406 @@
         <!-- small enough to include for now -->
         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
+        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     </target>
 
@@ -1423 +1424 @@
         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
+        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     </target>
 

router/java/src/net/i2p/router/RouterClock.java

@@ -41 +41 @@
     private long _lastChanged;
     private int _lastStratum;
-    private final Timestamper _timeStamper;
+    private final RouterTimestamper _timeStamper;
 
     /**
@@ -54 +54 @@
     private volatile long _lastShiftNanos;
 
+    /**
+     *  Does not start. Caller MUST call start()
+     */
     public RouterClock(RouterContext context) {
         super(context);
@@ -61 +64 @@
         _lastShiftNanos = System.nanoTime();
         _timeStamper = new RouterTimestamper(context, this);
+    }
+
+    /**
+     *  Cannot be stopped, but RouterTimestamper registers a shutdown task.
+     *  @since 0.9.20
+     */
+    public void start() {
+        _timeStamper.startTimestamper();
     }
 

router/java/src/net/i2p/router/RouterContext.java

@@ -484 +484 @@
     protected void initializeClock() {
         synchronized (_lock1) {
-            if (_clock == null)
-                _clock = new RouterClock(this);
+            if (_clock == null) {
+                RouterClock rc = new RouterClock(this);
+                rc.start();
+                _clock = rc;
+            }
             _clockInitialized = true;
         }

router/java/src/net/i2p/router/time/RouterTimestamper.java

@@ -21 +21 @@
 public class RouterTimestamper extends Timestamper {
     private final I2PAppContext _context;
+    // warning, may be null
     private Log _log;
     private final List<String> _servers;
-    private List<String> _priorityServers;
+    private List<List<String>> _priorityServers;
     private final List<UpdateListener> _listeners;
     private int _queryFrequency;
@@ -34 +35 @@
     private volatile boolean _isRunning;
     private Thread _timestamperThread;
+    private final Zones _zones;
     
     private static final int MIN_QUERY_FREQUENCY = 5*60*1000;
     private static final int DEFAULT_QUERY_FREQUENCY = 11*60*1000;
     private static final String DEFAULT_SERVER_LIST = "0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org";
-    private static final String DEFAULT_DISABLED = "true";
+    private static final boolean DEFAULT_DISABLED = true;
     /** how many times do we have to query if we are changing the clock? */
     private static final int DEFAULT_CONCURRING_SERVERS = 3;
@@ -52 +54 @@
     private static final int MAX_VARIANCE = 10*1000;
         
+    /**
+     *  Does not start. Caller MUST call startTimestamper()
+     */
     public RouterTimestamper(I2PAppContext ctx) {
         this(ctx, null, true);
     }
     
+    /**
+     *  Does not start. Caller MUST call startTimestamper()
+     */
     public RouterTimestamper(I2PAppContext ctx, UpdateListener lsnr) {
         this(ctx, lsnr, true);
     }
+
+    /**
+     *  Does not start. Caller MUST call startTimestamper()
+     */
     public RouterTimestamper(I2PAppContext ctx, UpdateListener lsnr, boolean daemon) {
         super();
@@ -72 +84 @@
         // so the property must be set at startup.
         // We still need to be instantiated since the router calls clock().getTimestamper().waitForInitialization()
-        String disabled = ctx.getProperty(PROP_DISABLED, DEFAULT_DISABLED);
-        if (Boolean.parseBoolean(disabled)) {
+        _disabled = ctx.getProperty(PROP_DISABLED, DEFAULT_DISABLED);
+        if (_disabled) {
             _initialized = true;
+            _zones = null;
+            System.out.println("Warning: NTP is disabled");
             return;
         }
         if (lsnr != null)
             _listeners.add(lsnr);
+        _zones = new Zones(ctx);
         updateConfig();
-        startTimestamper();
     }
     
@@ -111 +125 @@
     }
     
-    private void startTimestamper() {
+    public void startTimestamper() {
+        if (_disabled || _initialized)
+            return;
         _timestamperThread = new I2PThread(this, "Timestamper", _daemon);
         _timestamperThread.setPriority(I2PThread.MIN_PRIORITY);
@@ -150 +166 @@
     @Override
     public void run() {
-        try { Thread.sleep(1000); } catch (InterruptedException ie) {}
-        _log = _context.logManager().getLog(Timestamper.class);
-        if (_log.shouldLog(Log.INFO))
-            _log.info("Starting timestamper");
         boolean lastFailed = false;
         try {
             while (_isRunning) {
+                // NOTE: _log is null the first time through, to prevent problems and stack overflows
                 updateConfig();
                 if (!_disabled) {
-                    // first the servers for our country, if we know what country we're in...
+                    // first the servers for our country and continent, we know what country we're in...
                     if (_priorityServers != null) {
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug("Querying servers " + _priorityServers);
-                        try {
-                            lastFailed = !queryTime(_priorityServers.toArray(new String[_priorityServers.size()]));
-                        } catch (IllegalArgumentException iae) {
-                            if ( (!lastFailed) && (_log.shouldLog(Log.WARN)) )
-                                _log.warn("Unable to reach country-specific NTP servers");
-                            lastFailed = true;
+                        for (List<String> servers : _priorityServers) {
+                            if (_log != null && _log.shouldDebug())
+                                _log.debug("Querying servers " + servers);
+                            try {
+                                lastFailed = !queryTime(servers.toArray(new String[servers.size()]));
+                            } catch (IllegalArgumentException iae) {
+                                if (!lastFailed && _log != null && _log.shouldWarn())
+                                    _log.warn("Unable to reach any regional NTP servers: " + servers);
+                                lastFailed = true;
+                            }
+                            if (!lastFailed)
+                                break;
                         }
                     }
                     // ... and then the global list, if that failed
                     if (_priorityServers == null || lastFailed) {
-                        if (_log.shouldLog(Log.DEBUG))
+                        if (_log != null && _log.shouldDebug())
                             _log.debug("Querying servers " + _servers);
                         try {
                             lastFailed = !queryTime(_servers.toArray(new String[_servers.size()]));
                         } catch (IllegalArgumentException iae) {
-                            if ( (!_initialized) && (_log.shouldLog(Log.ERROR)) ) {
-                                List<String> all = new ArrayList<String>();
-                                if (_priorityServers != null)
-                                    all.addAll(_priorityServers);
-                                all.addAll(_servers);
-                                _log.error("Unable to reach any of the NTP servers " + all + " - network disconnected? Or set time.sntpServerList=myserver1.com,myserver2.com in advanced configuration.");
-                            }
                             lastFailed = true;
                         }
@@ -190 +200 @@
                 }
                 
-                _initialized = true;
+                boolean wasInitialized = _initialized;
+                if (!wasInitialized)
+                    _initialized = true;
                 synchronized (this) { notifyAll(); }
+                if (!wasInitialized) {
+                    // let the log manager get initialized
+                    try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
+                    // NOW we set up logging
+                    _log = _context.logManager().getLog(RouterTimestamper.class);
+                    if (lastFailed) {
+                        List<String> all = new ArrayList<String>(9);
+                        if (_priorityServers != null) {
+                            for (List<String> servers : _priorityServers) {
+                                all.addAll(servers);
+                            }
+                        }
+                        all.addAll(_servers);
+                        String msg = "Unable to reach any of the NTP servers " + all +
+                                     " - network disconnected? Or set time.sntpServerList=myserver1.com,myserver2.com in advanced configuration.";
+                        _log.logAlways(Log.WARN, msg);
+                        System.out.println("Warning: " + msg);
+                    } else if (_log.shouldDebug()) {
+                        _log.debug("NTP initialization successful");
+                        int i = 1;
+                        if (_priorityServers != null) {
+                            for (List<String> servers : _priorityServers) {
+                                _log.debug("NTP Server list " + (i++) + ": " + servers);
+                            }
+                        }
+                        _log.debug("NTP Server list " + i + ": " + _servers);
+                    }
+                }
                 long sleepTime;
                 if (lastFailed) {
@@ -207 +247 @@
             }
         } catch (Throwable t) {
-            _log.log(Log.CRIT, "Timestamper died!", t);
             synchronized (this) { notifyAll(); }
+            if (_log != null)
+                _log.log(Log.CRIT, "Timestamper died!", t);
+            t.printStackTrace();
         }
     }
@@ -233 +275 @@
             if (i == 0) {
                 if (Math.abs(delta) < MAX_VARIANCE) {
-                    if (_log.shouldLog(Log.INFO))
+                    if (_log != null && _log.shouldInfo())
                         _log.info("a single SNTP query was within the tolerance (" + delta + "ms)");
                     // If less than a half second on the first try, we're in good shape
@@ -244 +286 @@
             } else {
                 if (Math.abs(delta - expectedDelta) > MAX_VARIANCE) {
-                    if (_log.shouldLog(Log.ERROR)) {
+                    if (_log != null && _log.shouldError()) {
                         StringBuilder err = new StringBuilder(96);
                         err.append("SNTP client variance exceeded at query ").append(i);
@@ -261 +303 @@
         }
         stampTime(now, stratum);
-        if (_log.shouldLog(Log.DEBUG)) {
+        if (_log != null && _log.shouldDebug()) {
             StringBuilder buf = new StringBuilder(64);
             buf.append("Deltas: ");
@@ -281 +323 @@
              lsnr.setNow(now, stratum);
         }
-        if (_log.shouldLog(Log.DEBUG))
+        if (_log != null && _log.shouldDebug())
             _log.debug("Stamped the time as " + now + " (delta=" + (now-before) + ")");
     }
  
     /**
-     * Reload all the config elements from the appContext
-     *
+     * Reload all the config elements from the appContext.
+     * No logging allowed here
      */
     private void updateConfig() {
@@ -299 +341 @@
                     country = country.toLowerCase(Locale.US);
             }
-            if (country != null &&  country.length() > 0) {
-                _priorityServers = new ArrayList<String>(3);
-                for (int i = 0; i < 3; i++)
-                     _priorityServers.add(i + "." + country + ".pool.ntp.org");
+            if (country != null &&  country.length() > 0 &&
+                !country.equals("a1") && !country.equals("a2")) {
+                _priorityServers = new ArrayList<List<String>>(2);
+                List<String> p1 = new ArrayList<String>(3);
+                for (int i = 0; i < 3; i++) {
+                     p1.add(i + "." + country + ".pool.ntp.org");
+                }
+                _priorityServers.add(p1);
+                String zone = _zones.getZone(country);
+                if (zone != null) {
+                    List<String> p2 = new ArrayList<String>(3);
+                    for (int i = 0; i < 3; i++) {
+                        p2.add(i + "." + zone + ".pool.ntp.org");
+                    }
+                    _priorityServers.add(p2);
+                }
             } else {
                 _priorityServers = null;
@@ -321 +375 @@
                                    _context.getProperty(PROP_QUERY_FREQUENCY, DEFAULT_QUERY_FREQUENCY));
         
-        String disabled = _context.getProperty(PROP_DISABLED, DEFAULT_DISABLED);
-        _disabled = Boolean.parseBoolean(disabled);
+        _disabled = _context.getProperty(PROP_DISABLED, DEFAULT_DISABLED);
         
         _concurringServers = Math.min(4, Math.max(1,

router/java/src/net/i2p/router/transport/GeoIP.java

@@ -74 +74 @@
     static final String PROP_GEOIP_ENABLED = "routerconsole.geoip.enable";
     public static final String PROP_GEOIP_DIR = "geoip.dir";
-    static final String GEOIP_DIR_DEFAULT = "geoip";
+    public static final String GEOIP_DIR_DEFAULT = "geoip";
     static final String GEOIP_FILE_DEFAULT = "geoip.txt";
     static final String COUNTRY_FILE_DEFAULT = "countries.txt";