From f9d8a2d79b11a9f63b4de7761100d0b7cbeca93e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 9 Feb 2009 14:34:23 +0000
Subject: [PATCH] allow smaller leasesets
---
.../i2p/router/tunnel/pool/TunnelPool.java | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 0fca44cc4..06a9b4999 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -468,7 +468,9 @@ public class TunnelPool {
if (_tunnels.size() < wanted) {
if (_log.shouldLog(Log.WARN))
_log.warn(toString() + ": Not enough tunnels (" + _tunnels.size() + ", wanted " + wanted + ")");
- return null;
+ // see comment below
+ if (_tunnels.size() <= 0)
+ return null;
}
long expireAfter = _context.clock().now(); // + _settings.getRebuildPeriod();
@@ -492,15 +494,26 @@ public class TunnelPool {
leases.add(lease);
}
+ // Go ahead and use less leases for now, hopefully a new tunnel will be built soon
+ // and we will get called again to generate a full leaseset.
+ // For clients with high tunnel count or length,
+ // this will make startup considerably faster, and reduce loss of leaseset
+ // when one tunnel is lost, thus making us much more robust.
+ // This also helps when returning to full lease count after reduce-on-idle
+ // or close-on-idle.
+ // So we will generate a succession of leases at startup. That's OK.
+ // Do we want a config option for this, or are there times when we shouldn't do this?
if (leases.size() < wanted) {
if (_log.shouldLog(Log.WARN))
_log.warn(toString() + ": Not enough leases (" + leases.size() + ", wanted " + wanted + ")");
- return null;
+ if (leases.size() <= 0)
+ return null;
}
LeaseSet ls = new LeaseSet();
Iterator iter = leases.iterator();
- for (int i = 0; i < wanted; i++)
+ int count = Math.min(leases.size(), wanted);
+ for (int i = 0; i < count; i++)
ls.addLease((Lease) iter.next());
if (_log.shouldLog(Log.INFO))
_log.info(toString() + ": built new leaseSet: " + ls);
--
GitLab