Add some debug logging to the allocate process when there is a backlog.

markt-asf · markt-asf · commit 43ba91292bf9 · 2015-06-12T13:45:44.000Z
Fix some bugs identified by unit test I haven't committed yet (because it is still failing) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1685091 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -563,7 +563,6 @@ private void releaseBackLog(int increment) {
             while (leftToAllocate > 0) {
                 leftToAllocate = allocate(this, leftToAllocate);
             }
-            allocate(this, increment);
             for (Entry<AbstractStream,int[]> entry : backLogStreams.entrySet()) {
                 int allocation = entry.getValue()[1];
                 if (allocation > 0) {
@@ -578,6 +577,10 @@ private void releaseBackLog(int increment) {
 
 
     private int allocate(AbstractStream stream, int allocation) {
+        if (log.isDebugEnabled()) {
+            log.debug(sm.getString("upgradeHandler.allocate.debug", getConnectionId(),
+                    stream.getIdentifier(), Integer.toString(allocation)));
+        }
         // Allocate to the specified stream
         int[] value = backLogStreams.get(stream);
         if (value[0] >= allocation) {
@@ -593,6 +596,11 @@ private int allocate(AbstractStream stream, int allocation) {
         value[0] = 0;
         leftToAllocate -= value[1];
 
+        if (log.isDebugEnabled()) {
+            log.debug(sm.getString("upgradeHandler.allocate.left",
+                    getConnectionId(), stream.getIdentifier(), Integer.toString(leftToAllocate)));
+        }
+
         // Recipients are children of the current stream that are in the
         // backlog.
         Set<AbstractStream> recipients = new HashSet<>();
@@ -608,6 +616,11 @@ private int allocate(AbstractStream stream, int allocation) {
 
             int totalWeight = 0;
             for (AbstractStream recipient : recipients) {
+                if (log.isDebugEnabled()) {
+                    log.debug(sm.getString("upgradeHandler.allocate.recipient",
+                            getConnectionId(), stream.getIdentifier(), recipient.getIdentifier(),
+                            Integer.toString(recipient.getWeight())));
+                }
                 totalWeight += recipient.getWeight();
             }
 
@@ -616,10 +629,13 @@ private int allocate(AbstractStream stream, int allocation) {
             Iterator<AbstractStream> iter = recipients.iterator();
             while (iter.hasNext()) {
                 AbstractStream recipient = iter.next();
-                // +1 is to avoid rounding issues triggering an infinite loop.
-                // Will cause a very slight over allocation but HTTP/2 should
-                // cope with that.
-                int share = 1 + leftToAllocate * recipient.getWeight() / totalWeight;
+                int share = leftToAllocate * recipient.getWeight() / totalWeight;
+                if (share == 0) {
+                    // This is to avoid rounding issues triggering an infinite
+                    // loop. It will cause a very slight over allocation but
+                    // HTTP/2 should cope with that.
+                    share = 1;
+                }
                 int remainder = allocate(recipient, share);
                 // Remove recipients that receive their full allocation so that
                 // they are excluded from the next allocation round.
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -66,6 +66,9 @@ streamProcessor.httpupgrade.notsupported=HTTP upgrade is not supported within HT
 streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed from [{2}] to [{3}]
 streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}], Frame type [{3}]
 
+upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}] bytes
+upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes unallocated - trying to allocate to children
+upgradeHandler.allocate.recipient=Connection [{0}], Stream [{1}], potential recipient [{2}] with weight [{3}]
 upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST (closing stream)
 upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error code [{2}], Debug data [{3}]
 upgradeHandler.init=Connection [{0}]
