Re: svn commit: r567156 - in /tomcat/trunk: ./ java/org/apache/catalina/loader/ java/org/apache/catalina/startup/
[EMAIL PROTECTED] wrote: Author: fhanik Date: Fri Aug 17 14:49:50 2007 New Revision: 567156 URL: http://svn.apache.org/viewvc?view=rev&rev=567156 Log: Added in the ability to name classloaders in Tomcat I still don't see much use for this: this is a proprietary hack :( The "auto-logging" feature that nobody liked could use this stuff, I guess ... Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r567259 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/tribes/transport/bio/BioReceiver.java webapps/docs/changelog.xml
Author: pero
Date: Sat Aug 18 04:49:41 2007
New Revision: 567259
URL: http://svn.apache.org/viewvc?view=rev&rev=567259
Log:
Set correct socket transfer buffer size
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?view=diff&rev=567259&r1=567258&r2=567259
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Sat Aug 18 04:49:41 2007
@@ -28,14 +28,9 @@
import org.apache.catalina.tribes.transport.AbstractRxTask;
/**
- * Title:
*
- * Description:
- *
- * Company:
- *
- * @author not attributable
- * @version 1.0
+ * @author Filip Hanik
+ * @version $Revision:$ $Date:$
*/
public class BioReceiver extends ReceiverBase implements Runnable,
ChannelReceiver, ListenCallback {
@@ -145,7 +140,7 @@
}
if ( socket == null ) continue;
socket.setReceiveBufferSize(getRxBufSize());
-socket.setSendBufferSize(getRxBufSize());
+socket.setSendBufferSize(getTxBufSize());
socket.setTcpNoDelay(getTcpNoDelay());
socket.setKeepAlive(getSoKeepAlive());
socket.setOOBInline(getOoBInline());
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=567259&r1=567258&r2=567259
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Aug 18 04:49:41 2007
@@ -75,6 +75,14 @@
+
+
+
+ Set correct BioReceiver transfer buffer size. (pero)
+
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r567117 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership: McastService.java McastServiceImpl.java
Hi Filip,
can you document the fix at changelog, please?
peter
Am 17.08.2007 um 21:36 schrieb [EMAIL PROTECTED]:
Author: fhanik
Date: Fri Aug 17 12:36:19 2007
New Revision: 567117
URL: http://svn.apache.org/viewvc?view=rev&rev=567117
Log:
back port from trunk, recovery options and retain membership
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/
McastService.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/
McastServiceImpl.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/
membership/McastService.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/
apache/catalina/tribes/membership/McastService.java?
view=diff&rev=567117&r1=567116&r2=567117
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/
McastService.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/
McastService.java Fri Aug 17 12:36:19 2007
@@ -217,6 +217,19 @@
public void setPort(int port) {
properties.setProperty("mcastPort", String.valueOf(port));
}
+
+public void setRecoveryCounter(int recoveryCounter) {
+properties.setProperty("recoveryCounter", String.valueOf
(recoveryCounter));
+}
+
+public void setRecoveryEnabled(boolean recoveryEnabled) {
+properties.setProperty("recoveryEnabled", String.valueOf
(recoveryEnabled));
+}
+
+public void setRecoverySleepTime(long recoverySleepTime) {
+properties.setProperty("recoverySleepTime", String.valueOf
(recoverySleepTime));
+}
+
/**
* @deprecated use getPort()
@@ -348,6 +361,13 @@
ttl,
soTimeout,
this);
+boolean recEnabled = Boolean.getBoolean
(properties.getProperty("recoveryEnabled","true"));
+impl.setRecoveryEnabled(recEnabled);
+int recCnt = Integer.parseInt(properties.getProperty
("recoveryCounter","10"));
+impl.setRecoveryCounter(recCnt);
+long recSlpTime = Long.parseLong(properties.getProperty
("recoverySleepTime","5000"));
+impl.setRecoverySleepTime(recSlpTime);
+
impl.start(level);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/
membership/McastServiceImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/
apache/catalina/tribes/membership/McastServiceImpl.java?
view=diff&rev=567117&r1=567116&r2=567117
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/
McastServiceImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/
McastServiceImpl.java Fri Aug 17 12:36:19 2007
@@ -21,14 +21,14 @@
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.MulticastSocket;
-
-import org.apache.catalina.tribes.MembershipListener;
-import java.util.Arrays;
import java.net.SocketTimeoutException;
-import org.apache.catalina.tribes.Member;
+import java.util.Arrays;
+
import org.apache.catalina.tribes.Channel;
-import java.net.InetSocketAddress;
+import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.MembershipListener;
/**
* A membership implementation using simple multicast.
@@ -126,6 +126,15 @@
protected int recoveryCounter = 10;
/**
+ * The time the recovery thread sleeps between recovery attempts
+ */
+protected long recoverySleepTime = 5000;
+
+/**
+ * Add the ability to turn on/off recovery
+ */
+protected boolean recoveryEnabled = true;
+/**
* Create a new mcast service impl
* @param member - the local member
* @param sendFrequency - the time (ms) in between pings sent out
@@ -169,7 +178,7 @@
receivePacket.setPort(port);
member.setCommand(new byte[0]);
member.getData(true, true);
-membership = new Membership(member);
+if ( membership == null ) membership = new Membership
(member);
}
protected void setupSocket() throws IOException {
@@ -365,6 +374,17 @@
return this.serviceStartTime;
}
+public int getRecoveryCounter() {
+return recoveryCounter;
+}
+
+public boolean isRecoveryEnabled() {
+return recoveryEnabled;
+}
+
+public long getRecoverySleepTime() {
+return recoverySleepTime;
+}
public class ReceiverThread extends Thread {
int errorCounter = 0;
@@ -431,6 +451,7 @@
public static synchronized boolean init(RecoveryThread t) {
if ( running ) return false;
+if ( !t.parent.isRecoveryEnabled()) return false;
running = true;
t.setName("Tribes-MembershipRecovery");
svn commit: r567295 - in /tomcat/build/tc5.5.x: RELEASE-PLAN-5.0.txt RELEASE-PLAN-5.5.txt
Author: markt Date: Sat Aug 18 10:05:31 2007 New Revision: 567295 URL: http://svn.apache.org/viewvc?view=rev&rev=567295 Log: Remove out of date files Removed: tomcat/build/tc5.5.x/RELEASE-PLAN-5.0.txt tomcat/build/tc5.5.x/RELEASE-PLAN-5.5.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r567298 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/
Author: pero
Date: Sat Aug 18 10:14:07 2007
New Revision: 567298
URL: http://svn.apache.org/viewvc?view=rev&rev=567298
Log:
Fix some timeout regression bugs with 5.5.23 and the new advanced socket config.
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java?view=diff&rev=567298&r1=567297&r2=567298
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Sat Aug 18 10:14:07 2007
@@ -102,7 +102,7 @@
private boolean soLingerOn = true;
private int soLingerTime = 3;
private int soTrafficClass = 0x04 | 0x08 | 0x010;
-private int timeout = 3000; //3 seconds
+private int timeout = -1; // Regression with older release, better set
timeout at production env
/**
* Compress message data bytes
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java?view=diff&rev=567298&r1=567297&r2=567298
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Sat Aug 18 10:14:07 2007
@@ -94,7 +94,7 @@
private int rxBufSize = 25188;
private int txBufSize = 43800;
-private long timeout = 3000;
+private int timeout = 3;
private boolean tcpNoDelay = true;
private boolean soKeepAlive = false;
private boolean ooBInline = true;
@@ -221,7 +221,7 @@
/**
* After failure make a resend
*/
-private boolean resend = false ;
+private boolean resend = true ;
// -
Constructor
@@ -627,7 +627,7 @@
* @return the timeout
* @since 5.5.25
*/
-public long getTimeout() {
+public int getTimeout() {
return timeout;
}
@@ -635,7 +635,7 @@
* @param timeout the timeout to set
* @since 5.5.25
*/
-public void setTimeout(long timeout) {
+public void setTimeout(int timeout) {
this.timeout = timeout;
}
@@ -666,7 +666,7 @@
* @deprecated since 5.5.25 use timeout instead
*/
public void setAckTimeout(long ackTimeout) {
-this.timeout = ackTimeout;
+this.timeout = (int)ackTimeout;
}
public long getKeepAliveTimeout() {
@@ -892,15 +892,15 @@
protected void createSocket() throws IOException, SocketException {
SocketAddress sockAddr = new InetSocketAddress(getAddress(),
getPort());
socket = new Socket();
-int timeout = (int) getTimeout();
+int timeout = getTimeout();
if (timeout > 0) {
socket.connect(sockAddr, timeout);
+ socket.setSoTimeout(timeout);
} else {
socket.connect(sockAddr);
}
socket.setSendBufferSize(getTxBufSize());
socket.setReceiveBufferSize(getRxBufSize());
-socket.setSoTimeout( (int) getTimeout());
socket.setTcpNoDelay(isTcpNoDelay());
socket.setKeepAlive(isSoKeepAlive());
socket.setReuseAddress(isSoReuseAddress());
@@ -1125,10 +1125,8 @@
new Long(this.timeout));
if ( !this.isSuspect() ) {
this.setSuspect(true);
-if ( log.isWarnEnabled() ) log.warn(errmsg, x);
-} else {
-if ( log.isDebugEnabled() )log.debug(errmsg, x);
}
+if ( log.isDebugEnabled() ) log.debug(errmsg, x);
throw x;
} finally {
if(doWaitAckStats) {
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/or
svn commit: r567301 - in /tomcat/build/tc5.5.x: ./ resources/ resources/confinstall/ resources/deployer/ resources/mbeans/
Author: markt Date: Sat Aug 18 10:26:53 2007 New Revision: 567301 URL: http://svn.apache.org/viewvc?view=rev&rev=567301 Log: License updates for the TC5 build module Modified: tomcat/build/tc5.5.x/.classpath tomcat/build/tc5.5.x/.project tomcat/build/tc5.5.x/BENCHMARKS.txt tomcat/build/tc5.5.x/BUILDING.txt tomcat/build/tc5.5.x/RELEASE-NOTES tomcat/build/tc5.5.x/RUNNING.txt tomcat/build/tc5.5.x/build.xml tomcat/build/tc5.5.x/resources/build.xml tomcat/build/tc5.5.x/resources/confinstall/server_1.xml tomcat/build/tc5.5.x/resources/confinstall/tomcat-users_1.xml tomcat/build/tc5.5.x/resources/deployer/build.xml tomcat/build/tc5.5.x/resources/logging.properties tomcat/build/tc5.5.x/resources/mbeans/tomcat5-ant.xml tomcat/build/tc5.5.x/resources/tomcat.spec tomcat/build/tc5.5.x/resources/welcome.main.html tomcat/build/tc5.5.x/sign.bat tomcat/build/tc5.5.x/tag.bat tomcat/build/tc5.5.x/tomcat.nsi Modified: tomcat/build/tc5.5.x/.classpath URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/.classpath?view=diff&rev=567301&r1=567300&r2=567301 == --- tomcat/build/tc5.5.x/.classpath (original) +++ tomcat/build/tc5.5.x/.classpath Sat Aug 18 10:26:53 2007 @@ -1,4 +1,20 @@ + Modified: tomcat/build/tc5.5.x/.project URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/.project?view=diff&rev=567301&r1=567300&r2=567301 == --- tomcat/build/tc5.5.x/.project (original) +++ tomcat/build/tc5.5.x/.project Sat Aug 18 10:26:53 2007 @@ -1,4 +1,20 @@ + build Modified: tomcat/build/tc5.5.x/BENCHMARKS.txt URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/BENCHMARKS.txt?view=diff&rev=567301&r1=567300&r2=567301 == --- tomcat/build/tc5.5.x/BENCHMARKS.txt (original) +++ tomcat/build/tc5.5.x/BENCHMARKS.txt Sat Aug 18 10:26:53 2007 @@ -1,3 +1,18 @@ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + Benchmarking Tomcat --- Modified: tomcat/build/tc5.5.x/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/BUILDING.txt?view=diff&rev=567301&r1=567300&r2=567301 == --- tomcat/build/tc5.5.x/BUILDING.txt (original) +++ tomcat/build/tc5.5.x/BUILDING.txt Sat Aug 18 10:26:53 2007 @@ -1,3 +1,18 @@ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + $Id$ = Modified: tomcat/build/tc5.5.x/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/RELEASE-NOTES?view=diff&rev=567301&r1=567300&r2=567301 == --- tomcat/build/tc5.5.x/RELEASE-NOTES (original) +++ tomcat/build/tc5.5.x/RELEASE-NOTES Sat Aug 18 10:26:53 2007 @@ -1,3 +1,19 @@ + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License.
