I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

store to a different ff after verify fail

Browse Source
This commit is contained in:
zzz
2010-01-16 18:59:00 +00:00
parent 95bb322cd7
commit abb62b93e3
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
View File

@ -217,6 +217,8 @@ public class FloodfillVerifyStoreJob extends JobImpl {
} }
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Verify failed (older) for " + _key); _log.warn("Verify failed (older) for " + _key);
if (_log.shouldLog(Log.INFO))
_log.info("Rcvd older lease: " + dsm.getLeaseSet());
} else if (_message instanceof DatabaseSearchReplyMessage) { } else if (_message instanceof DatabaseSearchReplyMessage) {
// assume 0 old, all new, 0 invalid, 0 dup // assume 0 old, all new, 0 invalid, 0 dup
getContext().profileManager().dbLookupReply(_target, 0, getContext().profileManager().dbLookupReply(_target, 0,
@ -238,7 +240,9 @@ public class FloodfillVerifyStoreJob extends JobImpl {
* the netDb store failed to verify, so resend it to a random floodfill peer * the netDb store failed to verify, so resend it to a random floodfill peer
* Fixme - since we now store closest-to-the-key, this is likely to store to the * Fixme - since we now store closest-to-the-key, this is likely to store to the
* very same ff as last time, until the stats get bad enough to switch. * very same ff as last time, until the stats get bad enough to switch.
* Pass the failed ff through as a don't-store-to? * Therefore, pass the failed ff through as a don't-store-to.
* Let's also add the one we just tried to verify with, as they could be a pair of no-flooders.
* So at least we'll try THREE ffs round-robin if things continue to fail...
*/ */
private void resend() { private void resend() {
DataStructure ds; DataStructure ds;
@ -246,8 +250,14 @@ public class FloodfillVerifyStoreJob extends JobImpl {
ds = _facade.lookupRouterInfoLocally(_key); ds = _facade.lookupRouterInfoLocally(_key);
else else
ds = _facade.lookupLeaseSetLocally(_key); ds = _facade.lookupLeaseSetLocally(_key);
if (ds != null) if (ds != null) {
_facade.sendStore(_key, ds, null, null, FloodfillNetworkDatabaseFacade.PUBLISH_TIMEOUT, null); Set<Hash> toSkip = new HashSet(2);
if (_sentTo != null)
toSkip.add(_sentTo);
if (_target != null)
toSkip.add(_target);
_facade.sendStore(_key, ds, null, null, FloodfillNetworkDatabaseFacade.PUBLISH_TIMEOUT, toSkip);
}
} }
private class VerifyTimeoutJob extends JobImpl { private class VerifyTimeoutJob extends JobImpl {