Author: markt
Date: Wed Feb 11 14:27:16 2015
New Revision: 1658969
URL: http://svn.apache.org/r1658969
Log:
Follow up to r1594198
Limit cases where a dispatch is not performed because processing is already on
a poller thread.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 11 14:27:16 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1658969&r1=1658968&r2=1658969&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
Wed Feb 11 14:27:16 2015
@@ -299,10 +299,22 @@ public class AsyncStateMachine {
if (state == AsyncState.STARTING) {
state = AsyncState.MUST_DISPATCH;
} else if (state == AsyncState.STARTED ||
- state == AsyncState.READ_WRITE_OP ||
state == AsyncState.TIMING_OUT ||
state == AsyncState.ERROR) {
state = AsyncState.DISPATCHING;
+ // A dispatch is always required.
+ // If on a non-container thread, need to get back onto a container
+ // thread to complete the processing.
+ // If on a container thread the current request/response are not
the
+ // request/response associated with the AsyncContext so need a new
+ // container thread to process the different request/response.
+ doDispatch = true;
+ } else if (state == AsyncState.READ_WRITE_OP) {
+ state = AsyncState.DISPATCHING;
+ // If on a container thread then the socket will be added to the
+ // poller poller when the thread exits the
+ // AbstractConnectionHandler.process() method so don't do a
dispatch
+ // here which would add it to the poller a second time.
if (!ContainerThreadMarker.isContainerThread()) {
doDispatch = true;
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1658969&r1=1658968&r2=1658969&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Wed Feb 11 14:27:16 2015
@@ -2144,4 +2144,106 @@ public class TestAsyncContextImpl extend
ac.dispatch(target);
}
}
+
+ @Test
+ public void testDispatchFromOtherContainerThread() throws Exception {
+ resetTracker();
+ // Setup Tomcat instance
+ Tomcat tomcat = getTomcatInstance();
+
+ // No file system docBase required
+ Context ctx = tomcat.addContext("", null);
+
+ NonAsyncServlet nonAsyncServlet = new NonAsyncServlet();
+ Tomcat.addServlet(ctx, "nonAsyncServlet", nonAsyncServlet);
+ ctx.addServletMapping("/target", "nonAsyncServlet");
+
+ AsyncStashServlet asyncStashServlet = new AsyncStashServlet();
+ Wrapper w1 = Tomcat.addServlet(ctx, "asyncStashServlet",
asyncStashServlet);
+ w1.setAsyncSupported(true);
+ ctx.addServletMapping("/asyncStashServlet", "asyncStashServlet");
+
+ AsyncRetrieveServlet asyncRetrieveServlet = new AsyncRetrieveServlet();
+ Wrapper w2 = Tomcat.addServlet(ctx, "asyncRetrieveServlet",
asyncRetrieveServlet);
+ w2.setAsyncSupported(true);
+ ctx.addServletMapping("/asyncRetrieveServlet", "asyncRetrieveServlet");
+
+ tomcat.start();
+
+ // First request in separate thread because the response won't be
+ // written until after the second request has been made.
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ getUrl("http://localhost:"; + getPort() +
"/asyncStashServlet");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ t.start();
+
+ // Wait for first request to get as far as it can
+ int count = 0;
+ while (count < 100 && getTrack() != null &&
+ !getTrack().startsWith("AsyncStashServletGet-")) {
+ count++;
+ Thread.sleep(100);
+ }
+
+ getUrl("http://localhost:"; + getPort() + "/asyncRetrieveServlet");
+
+ // Wait for second request to release first and allow it to complete
+ String expectedTrack =
"AsyncStashServletGet-AsyncRetrieveServletGet-NonAsyncServletGet-";
+ count = 0;
+ while (count < 100 && !getTrack().equals(expectedTrack)) {
+ count++;
+ Thread.sleep(100);
+ }
+
+ Assert.assertEquals(expectedTrack, getTrack());
+ }
+
+ private static class AsyncStashServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 1L;
+ private static final String DEFAULT_KEY = "DEFAULT";
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+
+ String key = req.getParameter("key");
+ if (key == null) {
+ key = DEFAULT_KEY;
+ }
+
+ req.getServletContext().setAttribute(key, req.startAsync());
+ TestAsyncContextImpl.track("AsyncStashServletGet-");
+ }
+ }
+
+ private static class AsyncRetrieveServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ private static final String DEFAULT_KEY = "DEFAULT";
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+
+ String key = req.getParameter("key");
+ if (key == null) {
+ key = DEFAULT_KEY;
+ }
+
+ AsyncContext ac = (AsyncContext)
req.getServletContext().getAttribute(key);
+ if (ac == null) {
+ TestAsyncContextImpl.track("FAIL:nullAsyncContext-");
+ } else {
+ TestAsyncContextImpl.track("AsyncRetrieveServletGet-");
+ ac.dispatch("/target");
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
