fhanik 2004/02/22 22:36:13
Modified: modules/cluster/src/share/org/apache/catalina/cluster
Member.java MembershipService.java
modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastService.java McastServiceImpl.java
modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
Log:
just minor logging changes, and added a start level to the cluster membership, for
future member merging purposes
Revision Changes Path
1.3 +6 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/Member.java
Index: Member.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/Member.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Member.java 16 Nov 2003 22:22:45 -0000 1.2
+++ Member.java 23 Feb 2004 06:36:13 -0000 1.3
@@ -106,4 +106,5 @@
* @return nr of milliseconds since this member started.
*/
public long getMemberAliveTime();
-}
\ No newline at end of file
+
+}
1.3 +16 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/MembershipService.java
Index: MembershipService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/MembershipService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MembershipService.java 5 Feb 2004 05:27:31 -0000 1.2
+++ MembershipService.java 23 Feb 2004 06:36:13 -0000 1.3
@@ -88,9 +88,21 @@
/**
* Starts the membership service. If a membership listeners is added
* the listener will start to receive membership events.
+ * Performs a start level 1 and 2
* @throws java.lang.Exception if the service fails to start.
*/
public void start() throws java.lang.Exception;
+
+ /**
+ * Starts the membership service. If a membership listeners is added
+ * the listener will start to receive membership events.
+ * @param level - level 1 starts listening for members, level 2
+ * starts broad casting the server
+ * @throws java.lang.Exception if the service fails to start.
+ */
+ public void start(int level) throws java.lang.Exception;
+
+
/**
* Stops the membership service
*/
1.8 +14 -6
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- McastService.java 5 Feb 2004 22:57:52 -0000 1.7
+++ McastService.java 23 Feb 2004 06:36:13 -0000 1.8
@@ -192,7 +192,15 @@
* @throws java.lang.Exception if a IO error occurs
*/
public void start() throws java.lang.Exception {
- if ( impl != null ) return;
+ start(1);
+ start(2);
+ }
+
+ public void start(int level) throws java.lang.Exception {
+ if ( impl != null ) {
+ impl.start(level);
+ return;
+ }
String host = getProperties().getProperty("tcpListenHost");
int port = Integer.parseInt(getProperties().getProperty("tcpListenPort"));
String name = "tcp://"+host+":"+port;
@@ -215,7 +223,7 @@
java.net.InetAddress.getByName(properties.getProperty("mcastAddress")),
this);
- impl.start();
+ impl.start(level);
log.info("Sleeping for
"+(Long.parseLong(properties.getProperty("msgFrequency"))*4)+" secs to establish
cluster membership");
Thread.currentThread().sleep((Long.parseLong(properties.getProperty("msgFrequency"))*4));
1.7 +19 -15
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- McastServiceImpl.java 13 Jan 2004 00:07:18 -0000 1.6
+++ McastServiceImpl.java 23 Feb 2004 06:36:13 -0000 1.7
@@ -181,21 +181,25 @@
/**
* Start the service
+ * @param level 1 starts the receiver, level 2 starts the sender
* @throws IOException if the service fails to start
* @throws IllegalStateException if the service is already started
*/
- public synchronized void start() throws IOException {
+ public synchronized void start(int level) throws IOException {
if ( doRun ) throw new IllegalStateException("Service already running.");
- serviceStartTime = System.currentTimeMillis();
- socket.joinGroup(address);
- doRun = true;
- sender = new SenderThread(sendFrequency);
- sender.setDaemon(true);
- receiver = new ReceiverThread();
- receiver.setDaemon(true);
- receiver.start();
- sender.start();
-
+ if ( level == 1 ) {
+ socket.joinGroup(address);
+ receiver = new ReceiverThread();
+ receiver.setDaemon(true);
+ receiver.start();
+ }
+ if ( level==2 ) {
+ serviceStartTime = System.currentTimeMillis();
+ sender = new SenderThread(sendFrequency);
+ sender.setDaemon(true);
+ sender.start();
+ doRun = true;
+ }
}
/**
1.16 +9 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Index: DeltaManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DeltaManager.java 6 Feb 2004 17:30:13 -0000 1.15
+++ DeltaManager.java 23 Feb 2004 06:36:13 -0000 1.16
@@ -394,6 +394,7 @@
cluster.send(msg);
session.resetDeltaRequest();
}
+ log.debug("Created a DeltaSession with Id["+session.getId()+"] Total
count="+sessions.size());
return (session);
@@ -878,7 +879,9 @@
switch (msg.getEventType()) {
case SessionMessage.EVT_GET_ALL_SESSIONS: {
//get a list of all the session from this manager
+ log.debug("Manager ("+name+") unloading sessions");
byte[] data = doUnload();
+ log.debug("Manager ("+name+") unloading sessions complete");
SessionMessage newmsg = new SessionMessage(name,
SessionMessage.EVT_ALL_SESSION_DATA,
data, "");
@@ -886,8 +889,10 @@
break;
}
case SessionMessage.EVT_ALL_SESSION_DATA: {
+ log.debug("Manager ("+name+") received session state data.");
byte[] data = msg.getSession();
doLoad(data);
+ log.debug("Manager ("+name+") state deserialized.");
stateTransferred = true;
break;
}
1.18 +10 -10
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Index: DeltaSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DeltaSession.java 12 Feb 2004 21:10:32 -0000 1.17
+++ DeltaSession.java 23 Feb 2004 06:36:13 -0000 1.18
@@ -1446,9 +1446,9 @@
Object value = (Object) stream.readObject();
if ((value instanceof String) && (value.equals(NOT_SERIALIZED)))
continue;
- if (log.isDebugEnabled())
- log.debug(" loading attribute '" + name +
- "' with value '" + value + "'");
+// if (log.isDebugEnabled())
+// log.debug(" loading attribute '" + name +
+// "' with value '" + value + "'");
synchronized (attributes) {
attributes.put(name, value);
}
@@ -1518,9 +1518,9 @@
stream.writeObject((String) saveNames.get(i));
try {
stream.writeObject(saveValues.get(i));
- if (log.isDebugEnabled())
- log.debug(" storing attribute '" + saveNames.get(i) +
- "' with value '" + saveValues.get(i) + "'");
+// if (log.isDebugEnabled())
+// log.debug(" storing attribute '" + saveNames.get(i) +
+// "' with value '" + saveValues.get(i) + "'");
} catch (NotSerializableException e) {
log.error(sm.getString("standardSession.notSerializable",
saveNames.get(i), id), e);
1.35 +7 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Index: SimpleTcpCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SimpleTcpCluster.java 5 Feb 2004 23:01:29 -0000 1.34
+++ SimpleTcpCluster.java 23 Feb 2004 06:36:13 -0000 1.35
@@ -570,6 +570,9 @@
}
public void lifecycleEvent(LifecycleEvent lifecycleEvent){
+ log.debug("\nlifecycleEvent\n\nType"+lifecycleEvent.getType()+
+ "\nData"+lifecycleEvent.getData()+
+ "\n\n\n");
}
// --------------------------------------------------------- Cluster Wide
Deployments
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
