Changeset eeeeef8


Ignore:
Timestamp:
Jan 7, 2015 7:16:55 PM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a02a265
Parents:
bcb9fe5
Message:

NetDB: Possible fixes for reseed completion not recognized (ticket #1384)

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    rbcb9fe5 reeeeef8  
    112015-01-07 zzz
    2  * ClientAppConfig: Start i2ptunnel sooner
     2 * ClientAppConfig: Start i2ptunnel sooner (ticket #1162)
     3 * NetDB: Possible fixes for reseed completion not recognized (ticket #1384)
    34 * Router: Add startup/shutdown state machine
     5 * Startup: Accept tunnels after 10 minutes instead of 20 (ticket #1152)
    46 * Tunnels: Cleanup, catch more cases of zero-hop configuration
    57
  • router/java/src/net/i2p/router/RouterVersion.java

    rbcb9fe5 reeeeef8  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 7;
     21    public final static long BUILD = 8;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java

    rbcb9fe5 reeeeef8  
    328328   
    329329    /**
    330      *  This is mostly for manual reseeding, i.e. the user manually
     330     *  This was mostly for manual reseeding, i.e. the user manually
    331331     *  copies RI files to the directory. Nobody does this,
    332332     *  so this is run way too often.
     333     *
     334     *  But it's also for migrating and reading the files after a reseed.
    333335     *  Reseed task calls wakeup() on completion.
    334336     *  As of 0.9.4, also initiates an automatic reseed if necessary.
    335337     */
    336338    private class ReadJob extends JobImpl {
    337         private long _lastModified;
    338         private long _lastReseed;
     339        private volatile long _lastModified;
     340        private volatile long _lastReseed;
    339341        private static final int MIN_ROUTERS = KademliaNetworkDatabaseFacade.MIN_RESEED;
    340342        private static final long MIN_RESEED_INTERVAL = 90*60*1000;
     
    363365            if (shouldScan) {
    364366                _log.info("Rereading new files");
     367                _lastModified = now;
    365368                // synch with the writer job
    366369                synchronized (_dbDir) {
    367370                    readFiles();
    368371                }
    369                 _lastModified = now;
    370372            }
    371373            requeue(READ_DELAY);
     
    430432           
    431433            if (!_initialized) {
     434                _initialized = true;
    432435                if (_facade.reseedChecker().checkReseed(routerCount)) {
    433436                    _lastReseed = _context.clock().now();
     
    436439                    _context.router().setNetDbReady();
    437440                }
    438                 _initialized = true;
    439441            } else if (_lastReseed < _context.clock().now() - MIN_RESEED_INTERVAL) {
    440442                int count = Math.min(routerCount, size());
Note: See TracChangeset for help on using the changeset viewer.