Author: markt
Date: Thu Oct 27 15:32:00 2011
New Revision: 1189808
URL: http://svn.apache.org/viewvc?rev=1189808&view=rev
Log:
Work around a known JVM bug that is fixed in 1.7.0_01 but still present
in 1.6.0_29 and was triggering intermittent unit test failures for
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.testMemberArrival
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 15:32:00 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Thu Oct 27 15:32:00 2011
@@ -132,7 +132,12 @@ public class NioReceiver extends Receive
// Get the associated ServerSocket to bind it with
ServerSocket serverSocket = serverChannel.socket();
// create a new Selector for use below
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
// set the port the server channel will listen to
//serverSocket.bind(new InetSocketAddress(getBind(),
getTcpListenPort()));
bind(serverSocket,getPort(),getAutoBind());
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Thu Oct 27 15:32:00 2011
@@ -59,7 +59,12 @@ public class ParallelNioSender extends A
new HashMap<Member, NioSender>();
public ParallelNioSender() throws IOException {
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
setConnected(true);
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Oct 27 15:32:00 2011
@@ -919,7 +919,12 @@ public class NioEndpoint extends Abstrac
protected volatile int keyCount = 0;
public Poller() throws IOException {
- this.selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ this.selector = Selector.open();
+ }
}
public int getKeyCount() { return keyCount; }
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Thu Oct 27 15:32:00 2011
@@ -65,7 +65,12 @@ public class NioSelectorPool {
if (SHARED && SHARED_SELECTOR == null) {
synchronized ( NioSelectorPool.class ) {
if ( SHARED_SELECTOR == null ) {
- SHARED_SELECTOR = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ SHARED_SELECTOR = Selector.open();
+ }
log.info("Using a shared selector for servlet write/read");
}
}
@@ -84,11 +89,26 @@ public class NioSelectorPool {
Selector s = null;
try {
s = selectors.size()>0?selectors.poll():null;
- if (s == null) s = Selector.open();
+ if (s == null) {
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ s = Selector.open();
+ }
+ }
else spare.decrementAndGet();
}catch (NoSuchElementException x ) {
- try {s = Selector.open();}catch (IOException iox){}
+ try {
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ s = Selector.open();
+ }
+ } catch (IOException iox) {
+ }
} finally {
if ( s == null ) active.decrementAndGet();//we were unable to find
a selector
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Thu Oct 27 15:32:00 2011
@@ -239,7 +239,12 @@ public class SecureNioChannel extends Ni
default : {
long now = System.currentTimeMillis();
if (selector==null) {
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ //
http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
key = getIOChannel().register(selector, hsStatus);
} else {
key.interestOps(hsStatus);
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
Thu Oct 27 15:32:00 2011
@@ -60,7 +60,12 @@ public class NioSenderTest {
}
public void init() throws Exception {
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
mbr = new MemberImpl("localhost",4444,0);
NioSender sender = new NioSender();
sender.setDestination(mbr);
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
Thu Oct 27 15:32:00 2011
@@ -32,7 +32,13 @@ import org.apache.catalina.tribes.transp
public class SocketNioSend {
public static void main(String[] args) throws Exception {
- Selector selector = Selector.open();
+ Selector selector;
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
Member mbr = new MemberImpl("localhost", 9999, 0);
ChannelData data = new ChannelData();
data.setOptions(Channel.SEND_OPTIONS_BYTE_MESSAGE);
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
Thu Oct 27 15:32:00 2011
@@ -30,7 +30,13 @@ import org.apache.catalina.tribes.transp
public class SocketNioValidateSend {
public static void main(String[] args) throws Exception {
- Selector selector = Selector.open();
+ Selector selector;
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
Member mbr = new MemberImpl("localhost", 9999, 0);
byte seq = 0;
byte[] buf = new byte[50000];
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1189808&r1=1189807&r2=1189808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 27 15:32:00 2011
@@ -192,6 +192,15 @@
Fix duplicate <code>resetDeltaRequest()</code> call in
<code>DeltaSession.setId(String)</code>. (kkolinko)
</fix>
+ <fix>
+ Work around a <a href="http://bugs.sun.com/view_bug.do?bug_id=6427854";>
+ known JVM bug</a> that is fixed in 1.7.0_01 but still present in
+ 1.6.0_29 and was triggering intermittent unit test failures for
+
<code>org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.testMemberArrival</code>.
+ The bug affects any components that use NIO although it was more likely
+ to be observed in the clustering module than the HTTP or AJP NIO
+ connector. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
