You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/11/22 14:55:43 UTC
svn commit: r1770851 - in /qpid/java/trunk/perftests: ./
src/main/java/org/apache/qpid/disttest/
src/main/java/org/apache/qpid/disttest/controller/
src/test/java/org/apache/qpid/disttest/controller/
Author: lquack
Date: Tue Nov 22 14:55:43 2016
New Revision: 1770851
URL: http://svn.apache.org/viewvc?rev=1770851&view=rev
Log:
NO-JIRA: [Java Broker, Performance Tests] Make registrationTimeout and commandResponseTimeout configurable through the command line
Modified:
qpid/java/trunk/perftests/pom.xml
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java
qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
Modified: qpid/java/trunk/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/pom.xml?rev=1770851&r1=1770850&r2=1770851&view=diff
==============================================================================
--- qpid/java/trunk/perftests/pom.xml (original)
+++ qpid/java/trunk/perftests/pom.xml Tue Nov 22 14:55:43 2016
@@ -40,6 +40,8 @@
<qpid.disttest.loglevel>info</qpid.disttest.loglevel>
<qpid.disttest.duration>5000</qpid.disttest.duration>
<qpid.disttest.distributed>false</qpid.disttest.distributed>
+ <qpid.disttest.registrationTimeout>60000</qpid.disttest.registrationTimeout>
+ <qpid.disttest.commandResponseTimeout>120000</qpid.disttest.commandResponseTimeout>
<!-- The following provide values for the disttest command line -->
<qpid.disttest.test_config>${basedir}/etc/testdefs</qpid.disttest.test_config>
@@ -186,6 +188,8 @@
<argument>test-config=${qpid.disttest.test_config}</argument>
<argument>distributed=${qpid.disttest.distributed}</argument>
<argument>writeToDb=false</argument>
+ <argument>registrationTimeout=${qpid.disttest.registrationTimeout}</argument>
+ <argument>commandResponseTimeout=${qpid.disttest.commandResponseTimeout}</argument>
<argument>hill-climb=${qpid.disttest.hillclimb}</argument>
<argument>hill-climber.max-runs=${qpid.disttest.hillclimb.max_runs}</argument>
<argument>hill-climber.start-target-rate=${qpid.disttest.hillclimb.start_target_rate}</argument>
@@ -266,6 +270,8 @@
<argument>test-config=${qpid.disttest.test_config}</argument>
<argument>distributed=false</argument>
<argument>writeToDb=false</argument>
+ <argument>registrationTimeout=${qpid.disttest.registrationTimeout}</argument>
+ <argument>commandResponseTimeout=${qpid.disttest.commandResponseTimeout}</argument>
<argument>hill-climb=${qpid.disttest.hillclimb}</argument>
<argument>hill-climber.max-runs=${qpid.disttest.hillclimb.max_runs}</argument>
<argument>hill-climber.start-target-rate=${qpid.disttest.hillclimb.start_target_rate}</argument>
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java?rev=1770851&r1=1770850&r2=1770851&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java Tue Nov 22 14:55:43 2016
@@ -50,6 +50,8 @@ public class ControllerRunner extends Ab
public static final String OUTPUT_DIR_PROP = "outputdir";
public static final String WRITE_TO_DB = "writeToDb";
public static final String RUN_ID = "runId";
+ public static final String REGISTRATION_TIMEOUT = "registrationTimeout";
+ public static final String COMMAND_RESPONSE_TIMEOUT = "commandResponseTimeout";
public static final String HILL_CLIMB = "hill-climb";
public static final String HILL_CLIMBER_MAX_NUMBER_OF_RUNS = "hill-climber.max-runs";
public static final String HILL_CLIMBER_START_TARGET_RATE = "hill-climber.start-target-rate";
@@ -62,6 +64,8 @@ public class ControllerRunner extends Ab
private static final String DISTRIBUTED_DEFAULT = "false";
private static final String OUTPUT_DIR_DEFAULT = ".";
private static final String WRITE_TO_DB_DEFAULT = "false";
+ private static final String REGISTRATION_TIMEOUT_DEFAULT = String.valueOf(60 * 1000);
+ private static final String COMMAND_RESPONSE_TIMEOUT_DEFAULT = String.valueOf(120 * 1000);
private static final String HILL_CLIMB_DEFAULT = "false";
private static final String HILL_CLIMBER_MAX_NUMBER_OF_RUNS_DEFAULT = "3";
private static final String HILL_CLIMBER_START_TARGET_RATE_DEFAULT = "1025";
@@ -84,6 +88,8 @@ public class ControllerRunner extends Ab
getCliOptions().put(OUTPUT_DIR_PROP, OUTPUT_DIR_DEFAULT);
getCliOptions().put(WRITE_TO_DB, WRITE_TO_DB_DEFAULT);
getCliOptions().put(RUN_ID, null);
+ getCliOptions().put(REGISTRATION_TIMEOUT, REGISTRATION_TIMEOUT_DEFAULT);
+ getCliOptions().put(COMMAND_RESPONSE_TIMEOUT, COMMAND_RESPONSE_TIMEOUT_DEFAULT);
getCliOptions().put(HILL_CLIMB, HILL_CLIMB_DEFAULT);
getCliOptions().put(HILL_CLIMBER_MAX_NUMBER_OF_RUNS,
HILL_CLIMBER_MAX_NUMBER_OF_RUNS_DEFAULT);
@@ -115,10 +121,7 @@ public class ControllerRunner extends Ab
try
{
- Controller controller = new Controller(jmsDelegate,
- DistributedTestConstants.REGISTRATION_TIMEOUT,
- DistributedTestConstants.COMMAND_RESPONSE_TIMEOUT,
- getCliOptions());
+ Controller controller = new Controller(jmsDelegate, getCliOptions());
String testConfigPath = getCliOptions().get(ControllerRunner.TEST_CONFIG_PROP);
List<String> testConfigFiles = _configFileHelper.getTestConfigFiles(testConfigPath);
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java?rev=1770851&r1=1770850&r2=1770851&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/DistributedTestConstants.java Tue Nov 22 14:55:43 2016
@@ -26,10 +26,5 @@ public abstract class DistributedTestCon
public static final String MSG_COMMAND_PROPERTY = "COMMAND";
public static final String MSG_JSON_PROPERTY = "JSON";
- public static final long REGISTRATION_TIMEOUT = 60 * 1000;
-
- /** set to a long time out because stopping clients can take a long time */
- public static final long COMMAND_RESPONSE_TIMEOUT = 120 * 1000;
-
public static final String CONTROLLER_QUEUE_JNDI_NAME = "controllerqueue";
}
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java?rev=1770851&r1=1770850&r2=1770851&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/Controller.java Tue Nov 22 14:55:43 2016
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.qpid.disttest.ControllerRunner;
import org.apache.qpid.disttest.DistributedTestException;
import org.apache.qpid.disttest.controller.config.Config;
import org.apache.qpid.disttest.controller.config.TestInstance;
@@ -51,12 +52,12 @@ public class Controller
private ClientRegistry _clientRegistry;
- public Controller(final ControllerJmsDelegate jmsDelegate, long registrationTimeout,
- long commandResponseTimeout, final Map<String, String> options)
+ public Controller(final ControllerJmsDelegate jmsDelegate,
+ final Map<String, String> options)
{
_jmsDelegate = jmsDelegate;
- _registrationTimeout = registrationTimeout;
- _commandResponseTimeout = commandResponseTimeout;
+ _registrationTimeout = Integer.parseInt(options.get(ControllerRunner.REGISTRATION_TIMEOUT));
+ _commandResponseTimeout = Integer.parseInt(options.get(ControllerRunner.COMMAND_RESPONSE_TIMEOUT));
_testRunnerFactory = new TestRunnerFactory();
_clientRegistry = new ClientRegistry();
_options = options;
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java?rev=1770851&r1=1770850&r2=1770851&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java Tue Nov 22 14:55:43 2016
@@ -30,7 +30,10 @@ import static org.mockito.Mockito.verify
import static org.mockito.Mockito.when;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.qpid.disttest.ControllerRunner;
import org.apache.qpid.disttest.DistributedTestException;
import org.apache.qpid.disttest.controller.config.Config;
import org.apache.qpid.disttest.jms.ControllerJmsDelegate;
@@ -55,8 +58,11 @@ public class ControllerTest extends Qpid
{
super.setUp();
_respondingJmsDelegate = mock(ControllerJmsDelegate.class);
+ final Map<String, String> controllerOptions = new HashMap<>();
+ controllerOptions.put(ControllerRunner.REGISTRATION_TIMEOUT, String.valueOf(REGISTRATION_TIMEOUT));
+ controllerOptions.put(ControllerRunner.COMMAND_RESPONSE_TIMEOUT, String.valueOf(COMMAND_RESPONSE_TIMEOUT));
_controller = new Controller(_respondingJmsDelegate,
- REGISTRATION_TIMEOUT, COMMAND_RESPONSE_TIMEOUT, Collections.<String,String>emptyMap());
+ controllerOptions);
_clientRegistry = mock(ClientRegistry.class);
Config configWithOneClient = createMockConfig(1);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org