root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x 

Closes gh-27470
This commit is contained in:
Andy Wilkinson 2021-07-23 11:02:24 +01:00
parent 807582ec06 9e81fb3e38
commit 589a22eb0d
1 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@ -44,11 +44,11 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.Callable;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
@ -1174,8 +1174,8 @@ public abstract class AbstractServletWebServerFactoryTests {
AtomicReference<GracefulShutdownResult> result = new AtomicReference<>();
this.webServer.shutDownGracefully(result::set);
this.webServer.stop();
Awaitility.await().atMost(Duration.ofSeconds(30))
.until(() -> GracefulShutdownResult.REQUESTS_ACTIVE == result.get());
assertThat(Awaitility.await().atMost(Duration.ofSeconds(30)).until(result::get, Objects::nonNull))
.isEqualTo(GracefulShutdownResult.REQUESTS_ACTIVE);
try {
blockingServlet.admitOne();
}
@ -1524,7 +1524,7 @@ public abstract class AbstractServletWebServerFactoryTests {
protected static class BlockingServlet extends HttpServlet {
private final BlockingQueue<CyclicBarrier> barriers = new ArrayBlockingQueue<>(10);
private final BlockingQueue<Blocker> blockers = new ArrayBlockingQueue<>(10);
public BlockingServlet() {
@ -1532,42 +1532,23 @@ public abstract class AbstractServletWebServerFactoryTests {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
CyclicBarrier barrier = new CyclicBarrier(2);
this.barriers.add(barrier);
try {
barrier.await();
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
catch (BrokenBarrierException ex) {
throw new ServletException(ex);
}
Blocker blocker = new Blocker();
this.blockers.add(blocker);
blocker.await();
}
public void admitOne() {
try {
CyclicBarrier barrier = this.barriers.take();
if (!barrier.isBroken()) {
barrier.await();
}
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
catch (BrokenBarrierException ex) {
throw new RuntimeException(ex);
}
public void admitOne() throws InterruptedException {
this.blockers.take().clear();
}
public void awaitQueue() throws InterruptedException {
while (this.barriers.isEmpty()) {
while (this.blockers.isEmpty()) {
Thread.sleep(100);
}
}
public void awaitQueue(int size) throws InterruptedException {
while (this.barriers.size() < size) {
while (this.blockers.size() < size) {
Thread.sleep(100);
}
}
@ -1576,45 +1557,58 @@ public abstract class AbstractServletWebServerFactoryTests {
static class BlockingAsyncServlet extends HttpServlet {
private final BlockingQueue<CyclicBarrier> barriers = new ArrayBlockingQueue<>(10);
private final BlockingQueue<Blocker> blockers = new ArrayBlockingQueue<>(10);
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
CyclicBarrier barrier = new CyclicBarrier(2);
this.barriers.add(barrier);
Blocker blocker = new Blocker();
this.blockers.add(blocker);
AsyncContext async = req.startAsync();
new Thread(() -> {
try {
barrier.await();
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
catch (BrokenBarrierException ex) {
}
blocker.await();
async.complete();
}).start();
}
private void admitOne() {
try {
this.barriers.take().await();
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
catch (BrokenBarrierException ex) {
throw new RuntimeException(ex);
}
private void admitOne() throws InterruptedException {
this.blockers.take().clear();
}
private void awaitQueue() throws InterruptedException {
while (this.barriers.isEmpty()) {
while (this.blockers.isEmpty()) {
Thread.sleep(100);
}
}
}
private static final class Blocker {
private boolean block = true;
private final Object monitor = new Object();
private void await() {
synchronized (this.monitor) {
while (this.block) {
try {
this.monitor.wait();
}
catch (InterruptedException ex) {
System.out.println("Interrupted!");
// Keep waiting
}
}
}
}
private void clear() {
synchronized (this.monitor) {
this.block = false;
this.monitor.notifyAll();
}
}
}
}