[jboss-cvs] JBoss Messaging SVN: r2931 - in trunk/tests: src/org/jboss/test/messaging/tools/container and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 27 06:21:49 EDT 2007
Author: timfox
Date: 2007-07-27 06:21:49 -0400 (Fri, 27 Jul 2007)
New Revision: 2931
Modified:
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/tools/container/StopRMIServer.java
Log:
StopRMIServer now shuts down all servers
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-07-27 09:59:55 UTC (rev 2930)
+++ trunk/tests/build.xml 2007-07-27 10:21:49 UTC (rev 2931)
@@ -253,22 +253,11 @@
</java>
</target>
- <target name="stop-rmi-server-clustering" depends="init"
- description="Stops the RMI server used by clustering tests">
- <java classname="org.jboss.test.messaging.tools.container.StopRMIServer"
- classpathref="test.execution.classpath">
- <sysproperty key="test.server.index" value="${test.server.index}"/>
- <sysproperty key="module.output" value="${tests.output}"/>
- <sysproperty key="test.logfile.suffix" value="stop-rmi-server-clustering"/>
- </java>
- </target>
-
<!-- ======================================================================================== -->
<!-- Test Execution Tasks -->
<!-- ======================================================================================== -->
<target name="tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
- <antcall target="crash-tests"/>
<antcall target="invm-tests"/>
<!--
@@ -295,13 +284,13 @@
</target>
<target name="short-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
- <antcall target="crash-tests"/>
<antcall target="invm-tests"/>
<antcall target="remote-tests"/>
- <!-- <antcall target="bridge-tests"/> -->
+ <antcall target="bridge-tests"/>
+
</target>
<target name="http-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
@@ -649,6 +638,8 @@
<target name="clustering-stress-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs the clustering tests">
+ <antcall target="stop-rmi-server"/>
+
<mkdir dir="${build.tests.reports}"/>
<echo message=""/>
@@ -702,11 +693,14 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="stop-rmi-server"/>
</target>
<target name="clustering-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs the clustering tests">
+ <antcall target="stop-rmi-server"/>
+
<mkdir dir="${build.tests.reports}"/>
<echo message=""/>
@@ -761,6 +755,7 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="stop-rmi-server"/>
</target>
<target name="bridge-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
@@ -827,7 +822,6 @@
<target name="memory-leak-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs MemoryLeakTests, but it starts the clustering for leak-clustering-tests">
-
<mkdir dir="${build.tests.reports}"/>
<echo message=""/>
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/StopRMIServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/StopRMIServer.java 2007-07-27 09:59:55 UTC (rev 2930)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/StopRMIServer.java 2007-07-27 10:21:49 UTC (rev 2931)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.messaging.tools.container;
-import java.rmi.ConnectException;
import java.rmi.Naming;
-import java.rmi.NotBoundException;
import org.jboss.logging.Logger;
+import org.jboss.test.messaging.tools.ServerManagement;
/**
* A utility to stop runaway rmi servers.
@@ -40,7 +39,7 @@
// Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(StopRMIServer.class);
-
+
// Static --------------------------------------------------------
public static void main(String[] args) throws Exception
@@ -52,66 +51,84 @@
host = "localhost";
}
- int index;
+ int index = -1; // -1 implies kill all servers
String serverIndex = System.getProperty("test.server.index");
- if (serverIndex == null)
+
+ index = Integer.parseInt(serverIndex);
+
+ if (index != -1)
{
- index = RMITestServer.DEFAULT_SERVER_INDEX;
+ killServer(host, index);
}
else
{
- index = Integer.parseInt(serverIndex);
- }
+ log.info("*** Attemptiong to kill all servers");
+ //Kill em all
+ for (int i = 0; i < ServerManagement.MAX_SERVER_COUNT; i++)
+ {
+ killServer(host, i);
+ }
+ }
+ }
+
+ // Attributes ----------------------------------------------------
- String name =
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ private static void killServer(String host, int index) throws Exception
+ {
+ String name =
"//" + host + ":" + RMITestServer.DEFAULT_REGISTRY_PORT + "/" +
RMITestServer.RMI_SERVER_PREFIX + index;
- log.info("Stopping " + name);
-
Server server;
try
{
server = (Server)Naming.lookup(name);
}
- catch(ConnectException e)
+ catch(Throwable t)
{
- log.info("Cannot contact the registry, the server is probably shut down already");
+ //Ignore
return;
}
- catch(NotBoundException e)
- {
- log.info("Cannot lookup " + name + ", the server is probably shut down already");
- return;
- }
-
+
try
{
server.kill();
}
catch (Throwable t)
{
+ //Ignore
}
+
+ try
+ {
+ while(true)
+ {
+ server.ping();
+ Thread.sleep(100);
+ }
+ }
+ catch (Throwable e)
+ {
+ //Ok
+ }
+
+ Thread.sleep(300);
- // The last RMI server will take with it the registry too
-
- log.info("RMI server stopped");
-
+ log.info("*** Killed remote server " + index);
}
- // Attributes ----------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
// Inner classes -------------------------------------------------
}
More information about the jboss-cvs-commits
mailing list