Author: sebb
Date: Thu Jun 11 14:18:36 2009
New Revision: 783782
URL: http://svn.apache.org/viewvc?rev=783782&view=rev
Log:
Fix problems with remote clients - bug introduced in 2.3.3
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=783782&r1=783781&r2=783782&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Thu Jun 11 14:18:36 2009
@@ -72,7 +72,7 @@
}
public void runTest() {
- log.info("about to run remote test");
+ log.info("about to run remote test on "+host);
new Thread(this).start();
log.info("done initiating run command");
}
@@ -119,10 +119,18 @@
try {
JMeterContextService.startTest();
- remote.configure(test);
- log.info("sent test");
+ remote.configure(test, host);
+ log.info("sent test to " + host);
+ if (savep != null){
+ log.info("Sending properties "+savep);
+ try {
+ remote.setProperties(savep);
+ } catch (RemoteException e) {
+ log.warn("Could not set properties: " + e.toString());
+ }
+ }
remote.runTest();
- log.info("sent run command");
+ log.info("sent run command to "+ host);
} catch (Exception ex) {
log.error("", ex); // $NON-NLS-1$
}
@@ -142,12 +150,9 @@
}
}
+ private Properties savep;
public void setProperties(Properties p) {
- log.info("Sending properties "+p);
- try {
- remote.setProperties(p);
- } catch (RemoteException e) {
- log.warn("Could not set properties: " + e.toString());
- }
+ savep = p;
+ // Sent later
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java?rev=783782&r1=783781&r2=783782&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
Thu Jun 11 14:18:36 2009
@@ -25,7 +25,7 @@
import org.apache.jorphan.collections.HashTree;
public interface RemoteJMeterEngine extends Remote {
- void configure(HashTree testTree) throws RemoteException;
+ void configure(HashTree testTree, String host) throws RemoteException;
void runTest() throws RemoteException, JMeterEngineException;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=783782&r1=783781&r2=783782&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Thu Jun 11 14:18:36 2009
@@ -41,8 +41,6 @@
private JMeterEngine backingEngine;
- private String hostName;
-
public static final int DEFAULT_RMI_PORT =
JMeterUtils.getPropDefault("server.rmi.port", 1099); // $NON-NLS-1$
@@ -77,7 +75,7 @@
throw new RemoteException("Cannot start. Unable to get local host
IP address.");
}
log.info("IP address="+localHost.getHostAddress());
- hostName = localHost.getHostName();
+ String hostName = localHost.getHostName();
if (localHost.isLoopbackAddress()){
throw new RemoteException("Cannot start. "+hostName+" is a
loopback address.");
}
@@ -95,8 +93,6 @@
}
try {
Registry reg = LocateRegistry.getRegistry(port);
- log.info("Creating JMeter engine on host "+hostName);
- backingEngine = new StandardJMeterEngine(hostName);// see setHost()
reg.rebind(JMETER_ENGINE_RMI_NAME, this);
log.info("Bound to registry on port " + port);
} catch (Exception ex) {
@@ -113,16 +109,14 @@
* @param testTree
* the feature to be added to the ThreadGroup attribute
*/
- public void configure(HashTree testTree) throws RemoteException {
- log.info("received test tree");
+ public void configure(HashTree testTree, String host) throws
RemoteException {
+ log.info("Creating JMeter engine on host "+host);
+ backingEngine = new StandardJMeterEngine(host);
backingEngine.configure(testTree);
}
public void runTest() throws RemoteException, JMeterEngineException {
log.info("running test");
- log.debug("This = " + this);
- long now=System.currentTimeMillis();
- System.out.println("Starting the test on host " + hostName + " @ "+new
Date(now)+" ("+now+")");
backingEngine.runTest();
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=783782&r1=783781&r2=783782&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Thu Jun 11 14:18:36 2009
@@ -194,6 +194,10 @@
}
public void runTest() throws JMeterEngineException {
+ if (host != null){
+ long now=System.currentTimeMillis();
+ System.out.println("Starting the test on host " + host + " @ "+new
Date(now)+" ("+now+")");
+ }
try {
Thread runningThread = new Thread(new
MyThreadGroup("JMeterThreadGroup"),this);
runningThread.start();
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=783782&r1=783781&r2=783782&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Jun 11 14:18:36 2009
@@ -100,6 +100,7 @@
<h3>General</h3>
<ul>
+<li>Fix problems with remote clients - bug introduced in 2.3.3</li>
</ul>
<!-- ==================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
