cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java DataSender.java LocalStrings.properties PooledSocketSender.java ReplicationListener.java ReplicationTransmitter.java SendMessageData.java SimpleTcpCluster.java SocketReplicationListener.java SocketReplicationThread.java TcpReplicationThread.java mbeans-descriptors.xml
pero2005/07/08 13:51:48
Modified:modules/cluster/src/share/org/apache/catalina/cluster/io
ListenCallback.java SocketObjectReader.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ClusterReceiverBase.java DataSender.java
LocalStrings.properties PooledSocketSender.java
ReplicationListener.java
ReplicationTransmitter.java SendMessageData.java
SimpleTcpCluster.java
SocketReplicationListener.java
SocketReplicationThread.java
TcpReplicationThread.java mbeans-descriptors.xml
Log:
send ack before message is handled
default is now that no wait ack is default.
Revision ChangesPath
1.4 +11 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/ListenCallback.java
Index: ListenCallback.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/ListenCallback.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListenCallback.java 26 Jun 2005 21:21:49 - 1.3
+++ ListenCallback.java 8 Jul 2005 20:50:30 - 1.4
@@ -26,8 +26,6 @@
* @author Peter Rossbach
* @version $Revision$, $Date$
*/
-
-
public interface ListenCallback
{
/**
@@ -35,6 +33,15 @@
* been received from one of the cluster nodes.
* @param data - the message bytes received from the cluster/replication
system
*/
- // public void messageDataReceived(byte[] data);
public void messageDataReceived(ClusterData data);
+
+/** receiver must be send ack
+ */
+ public boolean isSendAck() ;
+
+ /** send ack
+ *
+ */
+ public void sendAck() throws java.io.IOException ;
+
}
\ No newline at end of file
1.4 +3 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/SocketObjectReader.java
Index: SocketObjectReader.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/SocketObjectReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketObjectReader.java 26 Jun 2005 21:21:49 - 1.3
+++ SocketObjectReader.java 8 Jul 2005 20:50:30 - 1.4
@@ -74,6 +74,8 @@
int pkgCnt = 0;
while ( pkgExists ) {
ClusterData cdata = buffer.extractPackage(true);
+if(callback.isSendAck())
+callback.sendAck() ;
callback.messageDataReceived(cdata);
pkgCnt++;
pkgExists = buffer.doesPackageExist();
1.9 +9 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Index: ClusterReceiverBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClusterReceiverBase.java 1 Jul 2005 18:35:54 - 1.8
+++ ClusterReceiverBase.java 8 Jul 2005 20:50:30 - 1.9
@@ -505,4 +505,12 @@
}
}
}
+
+/* (non-Javadoc)
+ * @see org.apache.catalina.cluster.io.ListenCallback#sendAck()
+ */
+public void sendAck() throws IOException {
+// do nothing
+}
+
}
1.14 +36 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Index: DataSender.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DataSender.java 26 Jun 2005 21:21:50 - 1.13
+++ DataSender.java 8 Jul 2005 20:50:30 - 1.14
@@ -120,6 +120,11 @@
protected long dataResendCounter = 0;
/**
+ * number of data failure sends
+ */
+protected long dataFailureCounter = 0;
+
+/**
* doProcessingStats
*/
protected boolean doProcessingStats = false;
@@ -182,7 +187,7 @@
/**
* wait for receiver Ack
*/
-private boolean waitForAck = true;
+private boolean waitForAck = false;
/**
* number of socket close
@@ -199,6 +204,12 @@
*/
private in
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java LocalStrings.properties SocketReplicationListener.java mbeans-descriptors.xml
pero2005/07/01 11:35:54
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ClusterReceiverBase.java LocalStrings.properties
SocketReplicationListener.java
mbeans-descriptors.xml
Log:
Fix timeout handling!
Revision ChangesPath
1.8 +2 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Index: ClusterReceiverBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClusterReceiverBase.java 1 Jul 2005 14:26:02 - 1.7
+++ ClusterReceiverBase.java 1 Jul 2005 18:35:54 - 1.8
@@ -303,7 +303,7 @@
Thread t = new Thread(this, "ClusterReceiver");
t.setDaemon(true);
t.start();
- } catch (Exception x) {
+} catch (Exception x) {
log.fatal("Unable to start cluster receiver", x);
}
registerReceiverMBean();
1.13 +1 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LocalStrings.properties 1 Jul 2005 14:26:02 - 1.12
+++ LocalStrings.properties 1 Jul 2005 18:35:54 - 1.13
@@ -55,5 +55,5 @@
SocketReplictionListener.openclose.failure=ServerSocket [{0}:{1}] -
Exception to open or close server socket
SocketReplictionListener.portbusy=Port busy at [{0}:{i}] - reason [{2}]
SocketReplictionListener.serverSocket.notExists=Fatal error: Receiver socket
not bound address={0} port={1} maxport={2}
-SocketReplictionListener.timeout=Receiver ServerSocket no started [{0}:{1}]
- timeout
+SocketReplictionListener.timeout=Receiver ServerSocket no started [{0}:{1}]
- reason: timeout={2} or listen={3}
SocketReplictionListener.unlockSocket.failure=UnLocksocket failure at
ServerSocket [{0:{1}]
1.5 +5 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
Index: SocketReplicationListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SocketReplicationListener.java1 Jul 2005 14:26:02 - 1.4
+++ SocketReplicationListener.java1 Jul 2005 18:35:54 - 1.5
@@ -111,7 +111,7 @@
super.start();
long reqStart = System.currentTimeMillis();
long reqNow = 0 ;
-boolean isTimeout = true ;
+boolean isTimeout = false ;
do {
try {
Thread.sleep(50);
@@ -119,10 +119,11 @@
}
reqNow = System.currentTimeMillis();
isTimeout = ((reqNow - reqStart) > (1000 *
getTcpListenTimeout()));
-} while (doListen && (!isTimeout));
+} while (!doListen && (!isTimeout));
if (isTimeout || (!doListen)) {
log.error(sm.getString("SocketReplictionListener.timeout",
-
getTcpListenAddress(),Integer.toString(getTcpListenPort(;
+
getTcpListenAddress(),Integer.toString(getTcpListenPort()),
+Long.toString(reqNow - reqStart),
Boolean.toString(doListen)));
}
}
1.14 +3 -0
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mbeans-descriptors.xml1 Jul 2005 16:51:14 - 1.13
+++ mbeans-descriptors.xml1 Jul 2005 18:35:54 - 1.14
@@ -197,6 +197,9 @@
+
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java LocalStrings.properties SocketReplicationListener.java
pero2005/07/01 07:26:02
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ClusterReceiverBase.java LocalStrings.properties
SocketReplicationListener.java
Log:
Fix wait that Recevier Port is bind
Add i18n message support
Revision ChangesPath
1.7 +2 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Index: ClusterReceiverBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClusterReceiverBase.java 30 Jun 2005 13:03:34 - 1.6
+++ ClusterReceiverBase.java 1 Jul 2005 14:26:02 - 1.7
@@ -303,7 +303,7 @@
Thread t = new Thread(this, "ClusterReceiver");
t.setDaemon(true);
t.start();
-} catch (Exception x) {
+ } catch (Exception x) {
log.fatal("Unable to start cluster receiver", x);
}
registerReceiverMBean();
1.12 +8 -0
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LocalStrings.properties 26 Jun 2005 21:21:50 - 1.11
+++ LocalStrings.properties 1 Jul 2005 14:26:02 - 1.12
@@ -49,3 +49,11 @@
SimpleTcpCluster.log.receive=RECEIVE {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4} {5}
SimpleTcpCluster.log.send=SEND {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4}
SimpleTcpCluster.log.send.all=SEND {0,date}:{0,time} {1,number} - {2}
+SocketReplictionListener.allreadyExists=ServerSocket [{0}:{1}] allready
started!
+SocketReplictionListener.accept.failure=ServerSocket [{0}:{1}] - Exception
to start thread or accept server socket
+SocketReplictionListener.open=Open Socket at [{0}:{1}]
+SocketReplictionListener.openclose.failure=ServerSocket [{0}:{1}] -
Exception to open or close server socket
+SocketReplictionListener.portbusy=Port busy at [{0}:{i}] - reason [{2}]
+SocketReplictionListener.serverSocket.notExists=Fatal error: Receiver socket
not bound address={0} port={1} maxport={2}
+SocketReplictionListener.timeout=Receiver ServerSocket no started [{0}:{1}]
- timeout
+SocketReplictionListener.unlockSocket.failure=UnLocksocket failure at
ServerSocket [{0:{1}]
1.4 +90 -13
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
Index: SocketReplicationListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketReplicationListener.java26 Jun 2005 21:21:50 - 1.3
+++ SocketReplicationListener.java1 Jul 2005 14:26:02 - 1.4
@@ -22,33 +22,55 @@
import java.net.Socket;
import org.apache.catalina.cluster.io.SocketObjectReader;
+import org.apache.catalina.util.StringManager;
/**
* @author Peter Rossbach
* @version $Revision$, $Date$
*/
public class SocketReplicationListener extends ClusterReceiverBase {
+
+// Statics
+
+public static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+.getLog(SocketReplicationListener.class);
+
+/**
+ * The string manager for this package.
+ */
+protected static StringManager sm = StringManager
+.getManager(Constants.Package);
+
/**
* The descriptive information about this implementation.
*/
private static final String info = "SocketReplicationListener/1.2";
+// Properties
private ServerSocket serverSocket = null;
private int tcpListenMaxPort ;
+/**
+ *
+ * One second timeout to wait that socket started
+ */
+private int tcpListenTimeout = 1 ;
+
+// Constructor
+
public SocketReplicationListener() {
}
+// Properties
+
/**
* Return descriptive information about th
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java ReplicationTransmitter.java ReplicationValve.java SimpleTcpCluster.java
pero2005/06/30 06:03:35
Modified:modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastService.java McastServiceImpl.java
modules/cluster/src/share/org/apache/catalina/cluster/session
JvmRouteBinderValve.java
JvmRouteSessionIDBinderLifecycleListener.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ClusterReceiverBase.java
ReplicationTransmitter.java ReplicationValve.java
SimpleTcpCluster.java
Log:
Support Cluster as Engine Element
Revision ChangesPath
1.16 +10 -7
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java
Index: McastService.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- McastService.java 26 Jun 2005 21:21:49 - 1.15
+++ McastService.java 30 Jun 2005 13:03:02 - 1.16
@@ -22,10 +22,12 @@
import javax.management.ObjectName;
import org.apache.catalina.Cluster;
+import org.apache.catalina.Container;
import org.apache.catalina.cluster.Member;
import org.apache.catalina.cluster.MembershipListener;
import org.apache.catalina.cluster.MembershipService;
import org.apache.catalina.cluster.tcp.SimpleTcpCluster;
+import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.StringManager;
import org.apache.commons.modeler.Registry;
@@ -351,15 +353,16 @@
try {
MBeanServer mserver = cluster.getMBeanServer();
initMBeans();
-ObjectName mcastName = new ObjectName(clusterName
-.getDomain()
-+ ":type=ClusterMembership,host="
-+ clusterName.getKeyProperty("host"));
+Container container = cluster.getContainer();
+String name = clusterName.getDomain() +
":type=ClusterMembership";
+if (container instanceof StandardHost) {
+name += ",host=" + clusterName.getKeyProperty("host");
+}
+ObjectName mcastName = new ObjectName(name);
if (mserver.isRegistered(mcastName)) {
if (log.isWarnEnabled())
log.warn(sm.getString(
-"cluster.mbean.register.allready",
-mcastName));
+"cluster.mbean.register.allready",
mcastName));
return;
}
setObjectName(mcastName);
1.16 +7 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Index: McastServiceImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- McastServiceImpl.java 9 Jun 2005 20:37:33 - 1.15
+++ McastServiceImpl.java 30 Jun 2005 13:03:02 - 1.16
@@ -210,11 +210,16 @@
if(log.isDebugEnabled())
log.debug("Mcast receive ping from member " + m);
if ( membership.memberAlive(m) ) {
+if(log.isDebugEnabled())
+log.debug("Mcast add member " + m);
service.memberAdded(m);
}
McastMember[] expired = membership.expire(timeToExpiration);
-for ( int i=0; i
+ * FIXME add Engine support
* @deprecated
* @author Peter Rossbach
*/
1.6 +9 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Index: ClusterReceiverBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClusterReceiverBase.java 26 Jun 2005 21:21:50 - 1.5
+++ ClusterReceiverBase.java 30 Jun 2005 13:03:34 - 1.6
@@ -25,12 +25,14 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.catalina.Container;
import org.apache.catalina.cluster.CatalinaCluster;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.ClusterReceiver;
import org.apache.catalina.cluster.io.Li
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java
fhanik 2005/04/18 07:29:28
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ClusterReceiverBase.java
Log:
Fixed spelling error
Revision ChangesPath
1.4 +4 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Index: ClusterReceiverBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClusterReceiverBase.java 16 Apr 2005 07:23:05 - 1.3
+++ ClusterReceiverBase.java 18 Apr 2005 14:29:28 - 1.4
@@ -402,7 +402,7 @@
timeSent = System.currentTimeMillis();
}
try {
-ClusterMessage message = deserialze(data);
+ClusterMessage message = deserialize(data);
cluster.receive(message);
} catch (Exception x) {
log
@@ -417,13 +417,13 @@
}
/**
- * deserialze the receieve cluster message
+ * deserialize the receieve cluster message
* @param data uncompress data
* @return
* @throws IOException
* @throws ClassNotFoundException
*/
-protected ClusterMessage deserialze(byte[] data)
+protected ClusterMessage deserialize(byte[] data)
throws IOException, ClassNotFoundException {
Object message = null;
if (data != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java
pero2005/04/16 00:23:05
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ClusterReceiverBase.java
Log:
Change method names
Revision ChangesPath
1.3 +4 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Index: ClusterReceiverBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClusterReceiverBase.java 15 Apr 2005 20:14:13 - 1.2
+++ ClusterReceiverBase.java 16 Apr 2005 07:23:05 - 1.3
@@ -402,7 +402,7 @@
timeSent = System.currentTimeMillis();
}
try {
-ClusterMessage message = createRecevierObject(data);
+ClusterMessage message = deserialze(data);
cluster.receive(message);
} catch (Exception x) {
log
@@ -417,13 +417,13 @@
}
/**
- * create the receieve cluster message
+ * deserialze the receieve cluster message
* @param data uncompress data
* @return
* @throws IOException
* @throws ClassNotFoundException
*/
-protected ClusterMessage createRecevierObject(byte[] data)
+protected ClusterMessage deserialze(byte[] data)
throws IOException, ClassNotFoundException {
Object message = null;
if (data != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
