Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Jun 16, 2021 · ece8feb · ece8feb
2 parents 7dcaa58 + a415606
commit ece8feb
Show file tree

Hide file tree

Showing 11 changed files with 730 additions and 536 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -9,6 +9,15 @@ jetty-11.0.5 - 11 June 2021
  + 6379 Reduce contention in all `ByteBufferPool` implementations
  + 6392 Review accidental xml config changes
 
+jetty-10.0.5 - 11 June 2021
+ + 4772 Jetty WebSocket API onMessage annotation does not support partial
+   messages.
+ + 6302 Treat empty path segments are ambiguous.
+ + 6329 Regression on graceful shutdown default in Jetty 10
+ + 6354 org.slf4j dependency imports osgi packages at 2.0
+ + 6379 Reduce contention in all `ByteBufferPool` implementations
+ + 6392 Review accidental xml config changes
+
 jetty-11.0.4 - 04 June 2021
  + 5379 Better handling for wrong SNI
  + 5931 SslConnection should implement getBytesIn()/getBytesOut()
@@ -23,6 +32,20 @@ jetty-11.0.4 - 04 June 2021
  + 6347 session-store-gcloud module broken logging dependency
  + 6354 org.slfj osgi dependency imports packages at 2.0
 
+jetty-10.0.4 - 04 June 2021
+ + 5379 Better handling for wrong SNI
+ + 5931 SslConnection should implement getBytesIn()/getBytesOut()
+ + 6112 Jetty logging service file leaking to web applications
+ + 6114 Jetty Deploy scan / symlink behavior is broken
+ + 6118 Display a warning when Hazelcast configuration does not contain Jetty
+   session serializer
+ + 6276 Support non-standard domains in SNI and X509
+ + 6305 Optimise `ContextHandler.isProtectedTarget`
+ + 6323 HttpClient gets stuck/never calls onComplete() when multiple requests
+   with timeouts are sent
+ + 6347 session-store-gcloud module broken logging dependency
+ + 6354 org.slfj osgi dependency imports packages at 2.0
+
 jetty-11.0.3 - 20 May 2021
  + 3764 DeprecationWarning Decorator
  + 5306 Default jetty.*.acceptors should be 1

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java
@@ -33,18 +33,14 @@
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.eclipse.jetty.util.thread.ExecutionStrategy;
-import org.eclipse.jetty.util.thread.TryExecutor;
-import org.eclipse.jetty.util.thread.strategy.EatWhatYouKill;
+import org.eclipse.jetty.util.thread.strategy.AdaptiveExecutionStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class HTTP2Connection extends AbstractConnection implements WriteFlusher.Listener, Connection.UpgradeTo
 {
     protected static final Logger LOG = LoggerFactory.getLogger(HTTP2Connection.class);
 
-    // TODO remove this once we are sure EWYK is OK for http2
-    private static final boolean PEC_MODE = Boolean.getBoolean("org.eclipse.jetty.http2.PEC_MODE");
-
     private final AutoLock lock = new AutoLock();
     private final Queue<Runnable> tasks = new ArrayDeque<>();
     private final HTTP2Producer producer = new HTTP2Producer();
@@ -64,9 +60,7 @@ public HTTP2Connection(ByteBufferPool byteBufferPool, Executor executor, EndPoin
         this.parser = parser;
         this.session = session;
         this.bufferSize = bufferSize;
-        if (PEC_MODE)
-            executor = new TryExecutor.NoTryExecutor(executor);
-        this.strategy = new EatWhatYouKill(producer, executor);
+        this.strategy = new AdaptiveExecutionStrategy(producer, executor);
         LifeCycle.start(strategy);
         parser.init(ParserListener::new);
     }

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
@@ -49,7 +49,7 @@
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.eclipse.jetty.util.thread.ExecutionStrategy;
 import org.eclipse.jetty.util.thread.Scheduler;
-import org.eclipse.jetty.util.thread.strategy.EatWhatYouKill;
+import org.eclipse.jetty.util.thread.strategy.AdaptiveExecutionStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -95,7 +95,7 @@ public ManagedSelector(SelectorManager selectorManager, int id)
         _id = id;
         SelectorProducer producer = new SelectorProducer();
         Executor executor = selectorManager.getExecutor();
-        _strategy = new EatWhatYouKill(producer, executor);
+        _strategy = new AdaptiveExecutionStrategy(producer, executor);
         addBean(_strategy, true);
     }