Changeset bd82a0c

Timestamp:

Dec 6, 2011 9:49:23 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

be1d95e

Parents:

0f384c8

Message:

increase next hop send timeout; log tweaks

Location:

router/java/src/net/i2p/router/tunnel

Files:

• HopConfig.java (modified) (2 diffs)
• TunnelCreatorConfig.java (modified) (2 diffs)
• TunnelDispatcher.java (modified) (4 diffs)
• pool/BuildHandler.java (modified) (6 diffs)

router/java/src/net/i2p/router/tunnel/HopConfig.java

@@ -149 +149 @@
             buf.append("recv on ");
             buf.append(DataHelper.fromLong(_receiveTunnelId, 0, 4));
-            buf.append(" ");
+            buf.append(' ');
         }
         
@@ -158 +158 @@
         }
         
-        buf.append(" expiring on ").append(TunnelCreatorConfig.format(_expiration));
-        buf.append(" having transferred ").append(_messagesProcessed).append("KB");
+        buf.append(" exp. ").append(TunnelCreatorConfig.format(_expiration));
+        if (_messagesProcessed > 0)
+            buf.append(" used ").append(_messagesProcessed).append("KB");
         return buf.toString();
     }

router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java

@@ -209 +209 @@
         StringBuilder buf = new StringBuilder(128);
         if (_isInbound)
-            buf.append("inbound");
+            buf.append("IB");
         else
-            buf.append("outbound");
+            buf.append("OB");
         if (_destination == null)
-            buf.append(" exploratory");
-        buf.append(": ");
+            buf.append(" expl");
+        else
+            buf.append(" client ").append(Base64.encode(_destination.getData(), 0, 3));
+        buf.append(": GW ");
         for (int i = 0; i < _peers.length; i++) {
             buf.append(_peers[i].toBase64().substring(0,4));
@@ -221 +223 @@
                 buf.append(_config[i].getReceiveTunnel());
             else
-                buf.append('x');
+                buf.append("me");
             buf.append('.');
             if (_config[i].getSendTunnel() != null)
                 buf.append(_config[i].getSendTunnel());
             else
-                buf.append('x');
+                buf.append("me");
             if (i + 1 < _peers.length)
-                buf.append("...");
+                buf.append("-->");
         }
         
-        buf.append(" expiring on ").append(getExpirationString());
-        if (_destination != null)
-            buf.append(" for ").append(Base64.encode(_destination.getData(), 0, 3));
+        buf.append(" exp. ").append(getExpirationString());
         if (_replyMessageId > 0)
-            buf.append(" replyMessageId ").append(_replyMessageId);
-        buf.append(" with ").append(_messagesProcessed).append("/").append(_verifiedBytesTransferred).append(" msgs/bytes");
-    
-        buf.append(" with ").append(_failures).append(" failures");
+            buf.append(" replyMsgID ").append(_replyMessageId);
+        if (_messagesProcessed > 0)
+            buf.append(" with ").append(_messagesProcessed).append("/").append(_verifiedBytesTransferred).append(" msgs/bytes");
+    
+        if (_failures > 0)
+            buf.append(" with ").append(_failures).append(" failures");
         return buf.toString();
     }

router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

@@ -266 +266 @@
     public void joinOutboundEndpoint(HopConfig cfg) {
         if (_log.shouldLog(Log.INFO))
-            _log.info("Joining as outbound endpoint: " + cfg);
+            _log.info("Joining as OBEP: " + cfg);
         TunnelId recvId = cfg.getReceiveTunnel();
         OutboundTunnelEndpoint endpoint = new OutboundTunnelEndpoint(_context, cfg, new HopProcessor(_context, cfg, _validator));
@@ -285 +285 @@
     public void joinInboundGateway(HopConfig cfg) {
         if (_log.shouldLog(Log.INFO))
-            _log.info("Joining as inbound gateway: " + cfg);
+            _log.info("Joining as IBGW: " + cfg);
         TunnelGateway.QueuePreprocessor preproc = createPreprocessor(cfg);
         TunnelGateway.Sender sender = new InboundSender(_context, cfg);
@@ -364 +364 @@
     public void remove(HopConfig cfg) {
         TunnelId recvId = cfg.getReceiveTunnel();
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("removing " + cfg);
         
         boolean removed = (null != _participatingConfig.remove(recvId));
-        if (!removed) {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Participating tunnel, but no longer listed in participatingConfig? " + cfg);
+        if (removed) {
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("removing " + cfg, new Exception());
+        } else {
+            // this is normal, this can get called twice
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Participating tunnel, but no longer listed in participatingConfig? " + cfg, new Exception());
         }
         
@@ -838 +840 @@
                 if (exp < now) {
                     _configs.poll();
+                    if (_log.shouldLog(Log.INFO))
+                        _log.info("Expiring " + cur);
                     remove(cur);
                 } else {

router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java

@@ -61 +61 @@
     private static final int MAX_QUEUE = 192;
 
+    private static final int NEXT_HOP_LOOKUP_TIMEOUT = 15*1000;
+    
+    /**
+     *  This must be high, as if we timeout the send we remove the tunnel from
+     *  participating via OnFailedSendJob.
+     *  If them msg actually got through then we will be dropping
+     *  all the traffic in TunnelDispatcher.dispatch(TunnelDataMessage msg, Hash recvFrom).
+     *  10s was not enough.
+     */
+    private static final int NEXT_HOP_SEND_TIMEOUT = 15*1000;
+
     public BuildHandler(RouterContext ctx, TunnelPoolManager manager, BuildExecutor exec) {
         _context = ctx;
@@ -110 +121 @@
         ctx.inNetMessagePool().registerHandlerJobBuilder(VariableTunnelBuildReplyMessage.MESSAGE_TYPE, tbrmhjb);
     }
-    
-    private static final int NEXT_HOP_LOOKUP_TIMEOUT = 15*1000;
     
     /**
@@ -651 +660 @@
         if (!isOutEnd) {
             state.msg.setUniqueId(req.readReplyMessageId());
-            state.msg.setMessageExpiration(_context.clock().now() + 10*1000);
+            state.msg.setMessageExpiration(_context.clock().now() + NEXT_HOP_SEND_TIMEOUT);
             OutNetMessage msg = new OutNetMessage(_context);
             msg.setMessage(state.msg);
@@ -661 +670 @@
             _context.outNetMessagePool().add(msg);
         } else {
+            // We are the OBEP.
             // send it to the reply tunnel on the reply peer within a new TunnelBuildReplyMessage
             // (enough layers jrandom?)
@@ -671 +681 @@
                 replyMsg.setRecord(i, state.msg.getRecord(i));
             replyMsg.setUniqueId(req.readReplyMessageId());
-            replyMsg.setMessageExpiration(_context.clock().now() + 10*1000);
+            replyMsg.setMessageExpiration(_context.clock().now() + NEXT_HOP_SEND_TIMEOUT);
             TunnelGatewayMessage m = new TunnelGatewayMessage(_context);
             m.setMessage(replyMsg);
@@ -864 +874 @@
      */
     private static class TunnelBuildNextHopFailJob extends JobImpl {
-        final HopConfig _cfg;
+        private final HopConfig _cfg;
+
         private TunnelBuildNextHopFailJob(RouterContext ctx, HopConfig cfg) {
             super(ctx);
             _cfg = cfg;
         }
+
         public String getName() { return "Timeout contacting next peer for tunnel join"; }
+
         public void runJob() {
             getContext().tunnelDispatcher().remove(_cfg);
             getContext().statManager().addRateData("tunnel.rejectTimeout2", 1, 0);
-            // static, no _log
-            //_log.error("Cant contact next hop for " + _cfg);
+            Log log = getContext().logManager().getLog(BuildHandler.class);
+            if (log.shouldLog(Log.WARN))
+                log.warn("Timeout contacting next hop for " + _cfg);
         }
     }