Author: sebb
Date: Tue Oct 16 07:39:22 2007
New Revision: 585155
URL: http://svn.apache.org/viewvc?rev=585155&view=rev
Log:
JMeter server now creates the RMI registry itself
Modified:
jakarta/jmeter/trunk/bin/jmeter-server
jakarta/jmeter/trunk/bin/jmeter-server.bat
jakarta/jmeter/trunk/bin/jmeter.bat
jakarta/jmeter/trunk/bin/jmeter.properties
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
jakarta/jmeter/trunk/xdocs/usermanual/remote-test.xml
Modified: jakarta/jmeter/trunk/bin/jmeter-server
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter-server?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter-server (original)
+++ jakarta/jmeter/trunk/bin/jmeter-server Tue Oct 16 07:39:22 2007
@@ -21,9 +21,11 @@
##
DIRNAME=`dirname $0`
-CLASSPATH=${DIRNAME}/../lib/ext/ApacheJMeter_core.jar:${DIRNAME}/../lib/jorphan.jar:${DIRNAME}/../lib/logkit-1.2.jar
rmiregistry $SERVER_PORT &
+
+## No longer needed - JMeter server creates the registry itself
+##CLASSPATH=${DIRNAME}/../lib/ext/ApacheJMeter_core.jar:${DIRNAME}/../lib/jorphan.jar:${DIRNAME}/../lib/logkit-1.2.jar
rmiregistry $SERVER_PORT &
# stop rmiregistry on interrupt
-trap "kill $!" 2
+##trap "kill $!" 2
# If the client fails with:
# ERROR - jmeter.engine.ClientJMeterEngine: java.rmi.ConnectException:
Connection refused to host: 127.0.0.1
Modified: jakarta/jmeter/trunk/bin/jmeter-server.bat
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter-server.bat?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter-server.bat (original)
+++ jakarta/jmeter/trunk/bin/jmeter-server.bat Tue Oct 16 07:39:22 2007
@@ -49,9 +49,12 @@
:setCP
echo Found ApacheJMeter_core.jar
-set
CLASSPATH=%JMETER_HOME%\lib\ext\ApacheJMeter_core.jar;%JMETER_HOME%\lib\jorphan.jar;%JMETER_HOME%\lib\logkit-1.2.jar
-START rmiregistry %SERVER_PORT%
+REM No longer need to create the rmiregistry as it is done by the server
+REM set
CLASSPATH=%JMETER_HOME%\lib\ext\ApacheJMeter_core.jar;%JMETER_HOME%\lib\jorphan.jar;%JMETER_HOME%\lib\logkit-1.2.jar
+
+REM START rmiregistry %SERVER_PORT%
+REM
if not "%OS%"=="Windows_NT" goto win9xStart
:winNTStart
Modified: jakarta/jmeter/trunk/bin/jmeter.bat
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.bat?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.bat (original)
+++ jakarta/jmeter/trunk/bin/jmeter.bat Tue Oct 16 07:39:22 2007
@@ -88,4 +88,9 @@
rem Collect the settings defined above
set ARGS=%HEAP% %NEW% %SURVIVOR% %TENURING% %EVACUATION% %RMIGC% %PERM% %DDRAW%
-%JM_START% %JM_LAUNCH% %JVM_ARGS% %ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar"
%JMETER_CMD_LINE_ARGS%
\ No newline at end of file
+%JM_START% %JM_LAUNCH% %JVM_ARGS% %ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar"
%JMETER_CMD_LINE_ARGS%
+
+echo level=%ERRORLEVEL%
+
+if NOT errorlevel 0 pause
+if errorlevel 1 pause
\ No newline at end of file
Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Tue Oct 16 07:39:22 2007
@@ -111,6 +111,13 @@
# On the client:
# - set remote_hosts=server:1234
+# To change the default port (1099) used to access the server:
+#server.rmi.port=1234
+
+# Since JMeter 2.3.1, the jmeter server creates the RMI registry as part of
the server process.
+# To stop the server creating the RMI registry:
+#server.rmi.create=false
+
#---------------------------------------------------------------------------
# Logging Configuration
#---------------------------------------------------------------------------
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Oct 16 07:39:22 2007
@@ -29,6 +29,19 @@
<h3>Version 2.3.1</h3>
+<h4>Incompatible changes</h4>
+<ul>
+<li>JMeter server now creates the RMI registry by default.
+If the RMI registry has already been started externally, this will generate a
warning message, but the server will continue.
+This should not affect JMeter testing.
+However, if you are also using the RMI registry for other applications there
may be problems.
+For example, when the JMeter server shuts down it will stop the RMI registry.
+Also user-written command files may need to be adjusted (the ones supplied
with JMeter have been updated)
+<br></br>
+To revert to the earlier behaviour, define the JMeter property:
server.rmi.create=false.
+</li>
+</ul>
+
<h4>Bug fixes</h4>
<ul>
<li>Bug 43430 - Count of active threads is incorrect for remote samples</li>
@@ -60,6 +73,7 @@
<li>Add optional "loopback" protocol for HttpClient sampler</li>
<li>HTTP Mirror Server now supports blocking waiting for more data to appear,
if content-length header is present in request</li>
<li>HTTP Mirror Server GUI now has the Start and Stop buttons in a more
visible place</li>
+<li>Server mode now creates the RMI registry; to disable set the JMeter
property server.rmi.create=false</li>
</ul>
<h4>Non-functional Improvements</h4>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml Tue Oct 16 07:39:22
2007
@@ -255,8 +255,6 @@
<subsection name="§-num;.4.4 Server Mode" anchor="server">
<p>For <a href="remote-test.html">distributed testing</a>, run JMeter in
server mode on the remote node(s), and then control the server(s) from the GUI.
You can also use non-GUI mode to run remote tests.
-<note>The jmeter-server/jmeter-server.bat script should start rmiregistry for
you with the appropriate classpath. If it fails to
-do so, <a href="remote-test.html#detail_instructions">read the details</a>
about starting the jmeter server.</note>
Run jmeter-server/jmeter-server.bat, plus these optional commands:</p>
<p>The script also lets you specify the optional firewall/proxy server
information:</p>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/remote-test.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/remote-test.xml?rev=585155&r1=585154&r2=585155&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/remote-test.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/remote-test.xml Tue Oct 16 07:39:22
2007
@@ -58,7 +58,11 @@
<p><b>Step 1: Start the servers </b></p>
<p>To run JMeter in remote node, start the JMeter server component on all
machines you wish to run on by running the <b>JMETER_HOME/bin/jmeter-server</b>
(unix) or <b>JMETER_HOME/bin/jmeter-server.bat</b> (windows) script.</p>
-
+<p>Note that there can only be one JMeter server on each node unless different
RMI ports are used.</p>
+<p>Since JMeter 2.3.1, the JMeter server application starts the RMI registry
itself;
+there is no need to start RMI registry separately.
+To revert to the previous behaviour, define the JMeter property
server.rmi.create=false on the server host systems.
+</p>
<p><b>Step 2: Add the server IP to your client's Properties File</b></p>
<p>Edit the properties file <i>on the controlling JMeter machine</i>. In
/bin/jmeter.properties, find the property named, "remote_hosts", and
add the value of your running JMeter server's IP address. Multiple such
servers can be added, comma-delimited.</p>
@@ -93,6 +97,11 @@
<subsection name="§-num;.1 Doing it Manually" anchor="detail_instructions">
<p>In some cases, the jmeter-server script may not work for you (if you are
using an OS platform not anticipated by the JMeter developers). Here is how to
start the JMeter servers (step 1 above) with a more manual process:</p>
<p><b>Step 1a: Start the RMI Registry</b></p>
+<p>
+Since JMeter 2.3.1, the RMI registry is started by the JMeter server, so this
section does not apply in the normal case.
+To revert to the previous behaviour, define the JMeter property
server.rmi.create=false on the server host systems
+and follow the instructions below.
+</p>
<p>JMeter uses Remote Method Invocation (RMI) as the remote communication
mechanism. Therefore, you need
to run the RMI Registry application (which is named, "rmiregistry") that comes
with the JDK and is located in the "bin"
directory. Before running rmiregistry, make sure that the following jars are
in your system claspath:
@@ -120,6 +129,10 @@
-J-Dsun.rmi.dgc.logLevel=verbose
-J-Dsun.rmi.transport.logLevel=verbose
-J-Dsun.rmi.transport.tcp.logLevel=verbose
+<p>Since JMeter 2.3.1, the RMI registry is started by the server; however the
options can still be passed in from the JMeter command line.
+For example: "jmeter -s -Dsun.rmi.loader.logLevel=verbose" (i.e. omit the -J
prefixes).
+Alternatively the properties can be defined in the system.properties file.
+</p>
<p>The solution to the problem is to remove the loopbacks 127.0.0.1 and
127.0.0.2 from etc/hosts. What happens is jmeter-server can't connect to
rmiregistry if 127.0.0.2 loopback is not available. Use the following settings
to fix the problem.</p>
<p> Replace</p>
<ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
