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

Issue #4351 - Lazy servlet init is not atomic. 

Code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-11-28 11:07:24 +01:00
parent 07efbb728d
commit dc0fac5806
1 changed files with 35 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/InitServletTest.java
View File

@ -22,34 +22,28 @@ import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.array;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class InitServletTest
{
public static class DemoServlet extends HttpServlet
{
AtomicInteger initCount = new AtomicInteger();
private static final long INIT_SLEEP = 2000;
private final AtomicInteger initCount = new AtomicInteger();
@Override
public void init() throws ServletException
@ -57,53 +51,44 @@ public class InitServletTest
super.init();
try
{
//Make the initialization last a little while so
//other request can run
Thread.sleep(2000);
// Make the initialization last a little while.
// Other requests must wait.
Thread.sleep(INIT_SLEEP);
}
catch (InterruptedException e)
{
throw new ServletException(e);
}
initCount.addAndGet(1);
initCount.incrementAndGet();
}
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
//Check that the init() method has been totally finished (by another request) before
//the servlet service() method is called.
// Check that the init() method has been totally finished (by another request)
// before the servlet service() method is called.
if (initCount.get() != 1)
{
resp.sendError(500, "Servlet not initialized!");
System.err.println("NOT INIT");
}
}
}
private static class AsyncResponseListener implements Response.CompleteListener
{
private final AtomicInteger index = new AtomicInteger();
private final CountDownLatch resultsLatch;
private final int[] results;
private CountDownLatch resultsLatch;
private Integer[] results;
private AtomicInteger index = new AtomicInteger();
public AsyncResponseListener(CountDownLatch resultsLatch, Integer[] results)
public AsyncResponseListener(CountDownLatch resultsLatch, int[] results)
{
this.resultsLatch = resultsLatch;
this.results = results;
this.resultsLatch = resultsLatch;
this.results = results;
}
public void onComplete(Result result)
{
results[index.getAndAdd(1)] = result.getResponse().getStatus();
results[index.getAndIncrement()] = result.getResponse().getStatus();
resultsLatch.countDown();
}
public void awaitCompletion() throws InterruptedException
{
assertTrue(resultsLatch.await(60L, TimeUnit.SECONDS));
}
}
@Test
@ -112,38 +97,35 @@ public class InitServletTest
Server server = new Server(0);
ServletContextHandler context = new ServletContextHandler(server, "/");
server.setHandler(context);
//add a lazily instantiated servlet
// Add a lazily instantiated servlet.
context.addServlet(new ServletHolder(DemoServlet.class), "/*");
server.start();
int port = ((NetworkConnector)server.getConnectors()[0]).getLocalPort();
HttpClient client = new HttpClient();
server.addBean(client);
server.start();
try
{
client.start();
int port = ((NetworkConnector)server.getConnectors()[0]).getLocalPort();
//Expect 2 responses
// Expect 2 responses
CountDownLatch resultsLatch = new CountDownLatch(2);
Integer[] results = new Integer[2];
int[] results = new int[2];
AsyncResponseListener l = new AsyncResponseListener(resultsLatch, results);
//req1: should initialize servlet
Request r1 = client.newRequest("http://localhost:" + port + "/r1");
r1.method(HttpMethod.GET).send(l);
//Need to give 1st request a head start before request2
Thread.sleep(500);
//req2: should see servlet fully initialized by request1
Request r2 = client.newRequest("http://localhost:" + port + "/r2");
r2.method(HttpMethod.GET).send(l);
// Req1: should initialize servlet.
client.newRequest("http://localhost:" + port + "/r1").send(l);
l.awaitCompletion();
assertThat(results, is(array(equalTo(HttpStatus.OK_200), equalTo(HttpStatus.OK_200))));
// Need to give 1st request a head start before request2.
Thread.sleep(DemoServlet.INIT_SLEEP / 4);
// Req2: should see servlet fully initialized by request1.
client.newRequest("http://localhost:" + port + "/r2").send(l);
assertTrue(resultsLatch.await(DemoServlet.INIT_SLEEP * 2, TimeUnit.MILLISECONDS));
assertEquals(HttpStatus.OK_200, results[0]);
assertEquals(HttpStatus.OK_200, results[1]);
}
finally
{
client.stop();
server.stop();
}
}