Merged branch 'jetty-9.3.x' into 'master'.

jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/HTTP2Test.java

@@ -39,6 +39,7 @@ import org.eclipse.jetty.http.HttpScheme;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http2.ErrorCode;
 import org.eclipse.jetty.http2.api.Session;
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.api.server.ServerSessionListener;
@@ -585,6 +586,48 @@ public class HTTP2Test extends AbstractTest
         Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS));
     }
 
+    @Test
+    public void testCleanGoAwayDoesNotTriggerFailureNotification() throws Exception
+    {
+        start(new ServerSessionListener.Adapter()
+        {
+            @Override
+            public Stream.Listener onNewStream(Stream stream, HeadersFrame frame)
+            {
+                MetaData.Response metaData = new MetaData.Response(HttpVersion.HTTP_2, HttpStatus.OK_200, new HttpFields());
+                HeadersFrame response = new HeadersFrame(stream.getId(), metaData, null, true);
+                stream.headers(response, Callback.NOOP);
+                // Close cleanly.
+                stream.getSession().close(ErrorCode.NO_ERROR.code, null, Callback.NOOP);
+                return null;
+            }
+        });
+
+        CountDownLatch closeLatch = new CountDownLatch(1);
+        CountDownLatch failureLatch = new CountDownLatch(1);
+        Session session = newClient(new Session.Listener.Adapter()
+        {
+            @Override
+            public void onClose(Session session, GoAwayFrame frame)
+            {
+                closeLatch.countDown();
+            }
+
+            @Override
+            public void onFailure(Session session, Throwable failure)
+            {
+                failureLatch.countDown();
+            }
+        });
+        MetaData.Request metaData = newRequest("GET", new HttpFields());
+        HeadersFrame request = new HeadersFrame(metaData, null, true);
+        session.newStream(request, new Promise.Adapter<>(), new Stream.Listener.Adapter());
+
+        // Make sure onClose() is called.
+        Assert.assertTrue(closeLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertFalse(failureLatch.await(1, TimeUnit.SECONDS));
+    }
+
     private static void sleep(long time)
     {
         try

jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java

@@ -230,7 +230,7 @@ public class HTTP2Flusher extends IteratingCallback
         if (actives.isEmpty())
         {
             if (isClosed())
-                abort(new ClosedChannelException());
+                fail(new ClosedChannelException(), true);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Flushed {}", session);
@@ -289,9 +289,6 @@ public class HTTP2Flusher extends IteratingCallback
     @Override
     protected void onCompleteFailure(Throwable x)
     {
-        if (LOG.isDebugEnabled())
-            LOG.debug("Failed", x);
-
         lease.recycle();
 
         // Transfer active items to avoid reentrancy.
@@ -306,10 +303,10 @@ public class HTTP2Flusher extends IteratingCallback
             entry.failed(x);
         }
 
-        abort(x);
+        fail(x, isClosed());
     }
 
-    private void abort(Throwable x)
+    private void fail(Throwable x, boolean closed)
     {
         Queue<Entry> queued;
         synchronized (this)
@@ -319,12 +316,13 @@ public class HTTP2Flusher extends IteratingCallback
         }
 
         if (LOG.isDebugEnabled())
-            LOG.debug("Aborting, queued={}", queued.size());
+            LOG.debug("{}, queued={}", closed ? "Closing" : "Failing", queued.size());
 
         for (Entry entry : queued)
-            closed(entry, x);
+            entry.failed(x);
 
-        session.abort(x);
+        if (!closed)
+            session.abort(x);
     }
 
     private void closed(Entry entry, Throwable failure)

jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java

@@ -989,8 +989,16 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
     @Override
     public String toString()
     {
-        return String.format("%s@%x{queueSize=%d,sendWindow=%s,recvWindow=%s,streams=%d,%s}", getClass().getSimpleName(),
-                hashCode(), flusher.getQueueSize(), sendWindow, recvWindow, streams.size(), closed);
+        return String.format("%s@%x{l:%s <-> r:%s,queueSize=%d,sendWindow=%s,recvWindow=%s,streams=%d,%s}",
+                getClass().getSimpleName(),
+                hashCode(),
+                getEndPoint().getLocalAddress(),
+                getEndPoint().getRemoteAddress(),
+                flusher.getQueueSize(),
+                sendWindow,
+                recvWindow,
+                streams.size(),
+                closed);
     }
 
     private class ControlEntry extends HTTP2Flusher.Entry

jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java

@@ -85,4 +85,13 @@ public class HttpConnectionOverHTTP2 extends HttpConnection
         }
         channels.clear();
     }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%h[%s]",
+                getClass().getSimpleName(),
+                this,
+                session);
+    }
 }