Author: markt
Date: Thu Mar 12 09:43:04 2015
New Revision: 1666109
URL: http://svn.apache.org/r1666109
Log:
Stop re-using the SocketWrapper
With the introduction of upgrade and non-blocking, I/O can occur on
non-container threads. This makes it near impossible to track whether a
SocketWrapper (== connection) is still referenced or not, making re-use a risky
proposition.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 09:43:04 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,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665779,1666024
+/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,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1666024
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1666109&r1=1666108&r2=1666109&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu
Mar 12 09:43:04 2015
@@ -2428,7 +2428,6 @@ public class AprEndpoint extends Abstrac
if (state == Handler.SocketState.CLOSED) {
// Close socket and pool
closeSocket(socket.getSocket().longValue());
- socket.reset(null, 1);
} else if (state == Handler.SocketState.LONG) {
socket.access();
if (socket.isAsync()) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1666109&r1=1666108&r2=1666109&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu
Mar 12 09:43:04 2015
@@ -114,11 +114,6 @@ public class Nio2Endpoint extends Abstra
private SynchronizedStack<SocketProcessor> processorCache;
/**
- * Cache for socket wrapper objects
- */
- private SynchronizedStack<Nio2SocketWrapper> socketWrapperCache;
-
- /**
* Bytebuffer cache, each channel holds a set of buffers (two, except for
SSL holds four)
*/
private SynchronizedStack<Nio2Channel> nioChannels;
@@ -248,7 +243,6 @@ public class Nio2Endpoint extends Abstra
protected void releaseCaches() {
if (useCaches) {
- this.socketWrapperCache.clear();
this.nioChannels.clear();
this.processorCache.clear();
}
@@ -348,8 +342,6 @@ public class Nio2Endpoint extends Abstra
if (useCaches) {
processorCache = new
SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getProcessorCache());
- socketWrapperCache = new
SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
- socketProperties.getSocketWrapperCache());
nioChannels = new
SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getBufferPool());
}
@@ -404,7 +396,6 @@ public class Nio2Endpoint extends Abstra
}
});
if (useCaches) {
- socketWrapperCache.clear();
nioChannels.clear();
processorCache.clear();
}
@@ -521,12 +512,9 @@ public class Nio2Endpoint extends Abstra
((SecureNio2Channel) channel).setSSLEngine(engine);
}
}
- Nio2SocketWrapper socketWrapper = (useCaches) ?
socketWrapperCache.pop() : null;
- if (socketWrapper == null) {
- socketWrapper = new Nio2SocketWrapper(channel);
- }
+ Nio2SocketWrapper socketWrapper = new Nio2SocketWrapper(channel);
channel.reset(socket, socketWrapper);
- socketWrapper.reset(channel, getSocketProperties().getSoTimeout());
+ socketWrapper.setTimeout(getSocketProperties().getSoTimeout());
socketWrapper.setKeepAliveLeft(Nio2Endpoint.this.getMaxKeepAliveRequests());
socketWrapper.setSecure(isSSLEnabled());
if (sslContext != null) {
@@ -648,7 +636,6 @@ public class Nio2Endpoint extends Abstra
}
} catch (Exception ignore) {
}
- nio2Socket.reset(null, -1);
countDownConnection();
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
@@ -762,13 +749,6 @@ public class Nio2Endpoint extends Abstra
}
@Override
- public void reset(Nio2Channel channel, long soTimeout) {
- super.reset(channel, soTimeout);
- upgradeInit = false;
- sendfileData = null;
- }
-
- @Override
public long getTimeout() {
long timeout = super.getTimeout();
return (timeout > 0) ? timeout : Long.MAX_VALUE;
@@ -1094,7 +1074,6 @@ public class Nio2Endpoint extends Abstra
closeSocket(socket, SocketStatus.ERROR);
if (useCaches && running && !paused) {
nioChannels.push(socket.getSocket());
- socketWrapperCache.push((Nio2SocketWrapper)
socket);
}
} else if (state == SocketState.UPGRADING) {
socket.setKeptAlive(true);
@@ -1105,7 +1084,6 @@ public class Nio2Endpoint extends Abstra
closeSocket(socket, SocketStatus.DISCONNECT);
if (useCaches && running && !paused) {
nioChannels.push(socket.getSocket());
- socketWrapperCache.push(((Nio2SocketWrapper) socket));
}
}
} catch (OutOfMemoryError oom) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1666109&r1=1666108&r2=1666109&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Mar 12 09:43:04 2015
@@ -130,11 +130,6 @@ public class NioEndpoint extends Abstrac
private SynchronizedStack<SocketProcessor> processorCache;
/**
- * Cache for key attachment objects
- */
- private SynchronizedStack<KeyAttachment> keyCache;
-
- /**
* Cache for poller events
*/
private SynchronizedStack<PollerEvent> eventCache;
@@ -304,7 +299,6 @@ public class NioEndpoint extends Abstrac
}
protected void releaseCaches() {
- this.keyCache.clear();
this.nioChannels.clear();
this.processorCache.clear();
if ( handler != null ) handler.recycle();
@@ -403,8 +397,6 @@ public class NioEndpoint extends Abstrac
processorCache = new
SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getProcessorCache());
- keyCache = new SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
- socketProperties.getKeyCache());
eventCache = new
SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getEventCache());
nioChannels = new
SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
@@ -455,7 +447,6 @@ public class NioEndpoint extends Abstrac
}
shutdownExecutor();
eventCache.clear();
- keyCache.clear();
nioChannels.clear();
processorCache.clear();
}
@@ -940,9 +931,9 @@ public class NioEndpoint extends Abstrac
*/
public void register(final NioChannel socket) {
socket.setPoller(this);
- KeyAttachment key = keyCache.pop();
- final KeyAttachment ka = key!=null?key:new KeyAttachment(socket);
- ka.reset(this,socket,getSocketProperties().getSoTimeout());
+ KeyAttachment ka = new KeyAttachment(socket);
+ ka.setPoller(this);
+ ka.setTimeout(getSocketProperties().getSoTimeout());
ka.setKeepAliveLeft(NioEndpoint.this.getMaxKeepAliveRequests());
ka.setSecure(isSSLEnabled());
PollerEvent r = eventCache.pop();
@@ -1000,8 +991,7 @@ public class NioEndpoint extends Abstrac
}
} catch (Exception ignore) {
}
- if (ka!=null) {
- ka.reset();
+ if (ka != null) {
countDownConnection();
}
} catch (Throwable e) {
@@ -1353,39 +1343,6 @@ public class NioEndpoint extends Abstrac
super(channel);
}
- public void reset(Poller poller, NioChannel channel, long soTimeout) {
- super.reset(channel, soTimeout);
-
- cometNotify = false;
- interestOps = 0;
- this.poller = poller;
- sendfileData = null;
- if (readLatch != null) {
- try {
- for (int i = 0; i < (int) readLatch.getCount(); i++) {
- readLatch.countDown();
- }
- } catch (Exception ignore) {
- }
- }
- readLatch = null;
- sendfileData = null;
- if (writeLatch != null) {
- try {
- for (int i = 0; i < (int) writeLatch.getCount(); i++) {
- writeLatch.countDown();
- }
- } catch (Exception ignore) {
- }
- }
- writeLatch = null;
- setWriteTimeout(soTimeout);
- }
-
- public void reset() {
- reset(null,null,-1);
- }
-
public Poller getPoller() { return poller;}
public void setPoller(Poller poller){this.poller = poller;}
public void setCometNotify(boolean notify) { this.cometNotify =
notify; }
@@ -1574,9 +1531,6 @@ public class NioEndpoint extends Abstrac
nioChannels.push(socket);
}
socket = null;
- if (running && !paused) {
- keyCache.push(ka);
- }
}
ka = null;
} catch (Exception x) {
@@ -1591,9 +1545,6 @@ public class NioEndpoint extends Abstrac
nioChannels.push(socket);
}
socket = null;
- if (running && !paused) {
- keyCache.push(ka);
- }
ka = null;
} else {
ka.getPoller().add(socket,handshake);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1666109&r1=1666108&r2=1666109&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Thu
Mar 12 09:43:04 2015
@@ -155,25 +155,6 @@ public class SocketWrapper<E> {
}
}
- public void reset(E socket, long timeout) {
- async = false;
- blockingStatus = true;
- comet = false;
- dispatches.clear();
- error = false;
- keepAliveLeft = 100;
- lastAccess = System.currentTimeMillis();
- localAddr = null;
- localName = null;
- localPort = -1;
- remoteAddr = null;
- remoteHost = null;
- remotePort = -1;
- this.socket = socket;
- this.timeout = timeout;
- upgraded = false;
- }
-
/**
* Overridden for debug purposes. No guarantees are made about the format
of
* this message which may vary significantly between point releases.
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1666109&r1=1666108&r2=1666109&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 12 09:43:04 2015
@@ -156,6 +156,13 @@
Numerous fixes to the APR/native connector to improve robustness.
(markt)
</fix>
+ <fix>
+ Stop caching and re-using SocketWrapper instances. With the
introduction
+ of upgrade and non-blocking I/O, I/O can occur on non-container
threads.
+ This makes it nearly impossible to track whether a SocketWrapper is
+ still being references or not. making re-use a risky proposition.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
