Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10774 from jetty/jetty-12.0.x-10346-JsrEchoTest 

Issue #10346 - fix bug in NetworkFuzzer to de-flake JsrEchoTest
This commit is contained in:
Lachlan 2023-10-30 17:13:46 +11:00 committed by GitHub
parent 7be6c4b375 e0f5d14330
commit 8ac8da777c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/NetworkFuzzer.java
View File

@ -29,6 +29,7 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.thread.AutoLock;
import org.eclipse.jetty.websocket.core.Behavior;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.CoreSession;
@ -214,9 +215,10 @@ public class NetworkFuzzer extends Fuzzer.Adapter implements Fuzzer, AutoCloseab
public static class FrameCapture implements FrameHandler
{
private final BlockingQueue<Frame> receivedFrames = new LinkedBlockingQueue<>();
private final CountDownLatch openLatch = new CountDownLatch(1);
private EndPoint endPoint;
private CountDownLatch openLatch = new CountDownLatch(1);
private CoreSession coreSession;
private final AutoLock lock = new AutoLock();
public void setEndPoint(EndPoint endpoint)
{
@ -235,8 +237,11 @@ public class NetworkFuzzer extends Fuzzer.Adapter implements Fuzzer, AutoCloseab
@Override
public void onFrame(Frame frame, Callback callback)
{
receivedFrames.offer(Frame.copy(frame));
callback.succeeded();
try (AutoLock ignored = lock.lock())
{
receivedFrames.add(Frame.copy(frame));
callback.succeeded();
}
coreSession.demand();
}
@ -263,7 +268,7 @@ public class NetworkFuzzer extends Fuzzer.Adapter implements Fuzzer, AutoCloseab
throw new IOException(e);
}
synchronized (this)
try (AutoLock ignored = lock.lock())
{
FutureCallback callback = new FutureCallback();
endPoint.write(callback, buffer);

13
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/NetworkFuzzer.java
View File

@ -29,6 +29,7 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.thread.AutoLock;
import org.eclipse.jetty.websocket.core.Behavior;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.CoreSession;
@ -214,9 +215,10 @@ public class NetworkFuzzer extends Fuzzer.Adapter implements Fuzzer, AutoCloseab
public static class FrameCapture implements FrameHandler
{
private final BlockingQueue<Frame> receivedFrames = new LinkedBlockingQueue<>();
private final CountDownLatch openLatch = new CountDownLatch(1);
private EndPoint endPoint;
private CountDownLatch openLatch = new CountDownLatch(1);
private CoreSession coreSession;
private final AutoLock lock = new AutoLock();
public void setEndPoint(EndPoint endpoint)
{
@ -235,8 +237,11 @@ public class NetworkFuzzer extends Fuzzer.Adapter implements Fuzzer, AutoCloseab
@Override
public void onFrame(Frame frame, Callback callback)
{
receivedFrames.offer(Frame.copy(frame));
callback.succeeded();
try (AutoLock ignored = lock.lock())
{
receivedFrames.add(Frame.copy(frame));
callback.succeeded();
}
coreSession.demand();
}
@ -263,7 +268,7 @@ public class NetworkFuzzer extends Fuzzer.Adapter implements Fuzzer, AutoCloseab
throw new IOException(e);
}
synchronized (this)
try (AutoLock ignored = lock.lock())
{
FutureCallback callback = new FutureCallback();
endPoint.write(callback, buffer);