shuber 2005/07/26 14:24:45 CEST
Modified files:
core/src/java/org/jahia/services/cluster
JGroupsClusterService.java
core/src/test/etc/cluster log4j_clusterservicetest.xml
core/src/test/src/java/org/jahia/services/cluster
AbstractClusterServiceTest.java
TestClusterServiceNode1.java
TestClusterServiceNode2.java
Log:
Working on cluster service tests.
Revision Changes Path
1.4 +21 -2
jahia/core/src/java/org/jahia/services/cluster/JGroupsClusterService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/cluster/JGroupsClusterService.java.diff?r1=1.3&r2=1.4&f=h
1.2 +4 -106
jahia/core/src/test/etc/cluster/log4j_clusterservicetest.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/etc/cluster/log4j_clusterservicetest.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
jahia/core/src/test/src/java/org/jahia/services/cluster/AbstractClusterServiceTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/src/java/org/jahia/services/cluster/AbstractClusterServiceTest.java.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
jahia/core/src/test/src/java/org/jahia/services/cluster/TestClusterServiceNode1.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/src/java/org/jahia/services/cluster/TestClusterServiceNode1.java.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
jahia/core/src/test/src/java/org/jahia/services/cluster/TestClusterServiceNode2.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/src/java/org/jahia/services/cluster/TestClusterServiceNode2.java.diff?r1=1.1&r2=1.2&f=h
Index: JGroupsClusterService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/cluster/JGroupsClusterService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JGroupsClusterService.java 25 Jul 2005 18:12:41 -0000 1.3
+++ JGroupsClusterService.java 26 Jul 2005 12:24:44 -0000 1.4
@@ -11,8 +11,11 @@
import org.jgroups.Message;
import org.jgroups.MessageListener;
import org.jgroups.View;
+import org.jgroups.util.RspList;
import org.jgroups.blocks.MessageDispatcher;
import org.jgroups.blocks.MessageListenerAdapter;
+import org.jgroups.blocks.GroupRequest;
+import org.jgroups.blocks.RequestHandler;
import java.io.Serializable;
import java.util.HashMap;
@@ -25,7 +28,10 @@
* Date: Jul 12, 2005
* Time: 6:03:37 PM
*/
-public class JGroupsClusterService extends ClusterService {
+public class JGroupsClusterService extends ClusterService implements
RequestHandler {
+
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger (JGroupsClusterService.class);
Channel channel = null;
MessageDispatcher messageDispatcher;
@@ -36,6 +42,11 @@
private MessageListenerAdapter messageListenerAdapter;
private MembershipListener membershipListener;
+ public Object handle(Message message) {
+ logger.debug("Handle message, returning success string");
+ return new String("Success !");
+ }
+
class JGroupsClusterMessage extends ClusterMessage {
public JGroupsClusterMessage(Message message) {
object = (Serializable) message.getObject();
@@ -51,6 +62,7 @@
}
public void receive(Message message) {
+ logger.debug("Received message " + message);
ClusterMessage clusterMessage = new
JGroupsClusterMessage(message);
clusterListener.messageReceived(clusterMessage);
}
@@ -66,12 +78,17 @@
class JGroupsMembershipListener implements MembershipListener {
public void viewAccepted(View view) {
+ logger.debug("viewAccepted VID:" + view.getVid() +
+ " creator:" + view.getCreator() +
+ " members:" + view.getMembers());
}
public void suspect(Address address) {
+ logger.debug("suspect " + address);
}
public void block() {
+ logger.debug("block");
}
}
@@ -140,7 +157,9 @@
Message message;
message=new Message(null, null, clusterMessage.getObject());
- messageDispatcher.castMessage(null, message, 6 /* GET_NONE */, 0 /*
infinite wait */);
+ RspList rsp_list;
+ rsp_list = messageDispatcher.castMessage(null, message,
GroupRequest.GET_NONE, 0 /* infinite wait */);
+ logger.debug("Responses:\n" +rsp_list);
}
public void addListener(ClusterListener listener) {
Index: log4j_clusterservicetest.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/etc/cluster/log4j_clusterservicetest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j_clusterservicetest.xml 25 Jul 2005 18:12:42 -0000 1.1
+++ log4j_clusterservicetest.xml 26 Jul 2005 12:24:44 -0000 1.2
@@ -2,130 +2,28 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
- <!--
- <appender name="Chainsaw" class="org.apache.log4j.net.SocketAppender">
- <param name="RemoteHost" value="localhost"/>
- <param name="Port" value="4445"/>
- <param name="LocationInfo" value="true"/>
- </appender>
- -->
-
- <appender name="ROLL" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="jahia.log"></param>
- <param name="MaxFileSize" value="1MB"></param>
- <param name="MaxBackupIndex" value="2"></param>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601}: [%t] %C{1},
%p, %c: %m%n"></param>
- </layout>
- </appender>
<appender name="Console" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601}: %p:
%m%n"></param>
- </layout>
- </appender>
-
- <appender name="jetspeed" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern"
- value="%6r [%t] %5p %c.%M:%L - %m%n"/>
+ <param name="ConversionPattern" value="%d{ISO8601}:%p,%c:%m
[%t]%n"></param>
</layout>
</appender>
- <logger name="REQUEST">
- <appender-ref ref="ROLL"></appender-ref>
- </logger>
-
- <logger name="SysOut">
- <appender-ref ref="Console"></appender-ref>
- </logger>
-
-
- <category name="org.apache.jetspeed">
- <priority value="info"/>
- <appender-ref ref="jetspeed"/>
- </category>
-
- <!--
- <category name="org.apache.log4j.xml">
- <priority value="debug"/>
- <appender-ref ref="Chainsaw"/>
- </category>
- -->
-
- <!--
-
- Uncomment the following if you need to filter on categories,
- such as class packages
-
- -->
-
- <!--
- <category name="org.jahia.utils.JahiaConsole">
- <priority value="info"/>
- </category>
- -->
-
<category name="org.jahia.services.cluster">
<priority value="debug"/>
</category>
- <category name="org.apache.slide">
- <priority value="info"/>
- </category>
-
- <category name="org.jahia.services.applications">
- <priority value="info"/>
- </category>
-
- <category name="org.apache.axis">
- <priority value="info"/>
- </category>
-
- <category name="org.apache.commons">
- <priority value="info"/>
- </category>
-
- <category name="org.apache.commons.httpclient">
- <priority value="error"/>
- </category>
-
- <category name="org.apache.jsp">
- <priority value="info"/>
- </category>
-
- <category name="org.apache.jasper">
- <priority value="info"/>
- </category>
-
- <category name="org.pdfbox">
- <priority value="error"/>
+ <category name="org.jgroups">
+ <priority value="warn"/>
</category>
<category name="org.springframework">
<priority value="info"/>
</category>
- <category name="org.jahia.blogs">
- <priority value="debug"/>
- </category>
-
- <category name="org.hibernate">
- <priority value="warn"/>
- </category>
-
- <category name="net.sf.ehcache">
- <priority value="warn"/>
- </category>
-
- <category name="org.jahia.hibernate">
- <priority value="error"/>
- </category>
-
<root>
- <level value ="info"></level>
- <appender-ref ref="ROLL"></appender-ref>
+ <level value ="debug"></level>
<appender-ref ref="Console"></appender-ref>
</root>
Index: AbstractClusterServiceTest.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/src/java/org/jahia/services/cluster/AbstractClusterServiceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractClusterServiceTest.java 25 Jul 2005 18:12:42 -0000 1.1
+++ AbstractClusterServiceTest.java 26 Jul 2005 12:24:45 -0000 1.2
@@ -33,8 +33,8 @@
protected ClusterService clusterService;
- protected long wakeupTime = 2000;
- protected long shutdownTime = 2000;
+ protected long wakeupTime = 30000;
+ protected long shutdownTime = 10000;
protected Serializable value = null;
Index: TestClusterServiceNode1.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/src/java/org/jahia/services/cluster/TestClusterServiceNode1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestClusterServiceNode1.java 25 Jul 2005 18:12:42 -0000 1.1
+++ TestClusterServiceNode1.java 26 Jul 2005 12:24:45 -0000 1.2
@@ -15,6 +15,6 @@
logger.debug("Sending first value...");
sendMessage("value1");
logger.debug("Waiting for value...");
- logger.debug("Received value: " + waitForValue(50, 100000));
+ logger.debug("Received value: " + waitForValue(100000, 50));
}
}
Index: TestClusterServiceNode2.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/src/java/org/jahia/services/cluster/TestClusterServiceNode2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestClusterServiceNode2.java 25 Jul 2005 18:12:42 -0000 1.1
+++ TestClusterServiceNode2.java 26 Jul 2005 12:24:45 -0000 1.2
@@ -13,7 +13,7 @@
public void testClusterServiceNode2 () throws InterruptedException {
logger.debug("Waiting for value...");
- logger.debug("Received value: " + waitForValue(50, 100000));
+ logger.debug("Received value: " + waitForValue(100000, 50));
logger.debug("Sending value...");
sendMessage("value2");
}
