qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From philharveyonl...@apache.org
Subject svn commit: r1499208 - in /qpid/trunk/qpid/java/perftests/etc: run-perftests.sh testdefs/Latency-MessageSize.json testdefs/VaryingNumberOfParticipants.js testdefs/VaryingNumberOfParticipants.json
Date Wed, 03 Jul 2013 04:46:24 GMT
Author: philharveyonline
Date: Wed Jul  3 04:46:24 2013
New Revision: 1499208

URL: http://svn.apache.org/r1499208
Log:
NO-JIRA: Java performance tests: refactored testdefs/VaryingNumberOfParticipants.json to use
JavaScript for loops etc to reduce duplication, and removed excessive message size latency
tests

Added:
    qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
Removed:
    qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.json
Modified:
    qpid/trunk/qpid/java/perftests/etc/run-perftests.sh
    qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json

Modified: qpid/trunk/qpid/java/perftests/etc/run-perftests.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/run-perftests.sh?rev=1499208&r1=1499207&r2=1499208&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/run-perftests.sh (original)
+++ qpid/trunk/qpid/java/perftests/etc/run-perftests.sh Wed Jul  3 04:46:24 2013
@@ -32,6 +32,6 @@ java -cp "${BASE_DIR}:${BASE_DIR}/../../
   -Dqpid.disttest.duration=$DURATION \
   org.apache.qpid.disttest.ControllerRunner \
   jndi-config=${BASE_DIR}/perftests-jndi.properties \
-  test-config=${BASE_DIR}/testdefs \
+  test-config=${BASE_DIR}/testdefs/VaryingNumberOfParticipants.js \
   distributed=false \
   writeToDb=true

Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json?rev=1499208&r1=1499207&r2=1499208&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json Wed Jul  3 04:46:24
2013
@@ -7,21 +7,12 @@
           "_messageSize": 256
         },
         {
-          "_messageSize": 512
-        },
-        {
           "_messageSize": 1024
         },
         {
-          "_messageSize": 2048
-        },
-        {
           "_messageSize": 4096
         },
         {
-          "_messageSize": 8192
-        },
-        {
           "_messageSize": 16384
         },
         {

Added: qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js?rev=1499208&view=auto
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js (added)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js Wed Jul  3
04:46:24 2013
@@ -0,0 +1,88 @@
+
+var jsonObject = {
+    _tests:[]
+};
+
+var duration = 30000;
+var queueName = "direct://amq.direct//varNumOfParticipants?durable='true'";
+
+var numbersOfProducers = [1, 2, 5, 10];
+var numbersOfConsumers = [1, 2, 5, 10];
+
+for(producersIndex=0; producersIndex < numbersOfProducers.length; producersIndex++)
+{
+    for(consumersIndex=0; consumersIndex < numbersOfConsumers.length; consumersIndex++)
+    {
+        var numberOfProducers = numbersOfProducers[producersIndex];
+        var numberOfConsumers = numbersOfConsumers[consumersIndex];
+        var test = {
+          "_name": "Varying number of participants: " + numberOfConsumers + " consumers -
" + numberOfProducers + " producers - PERSISTENT",
+          "_queues":[
+            {
+              "_name": queueName,
+              "_durable": true
+            }
+          ],
+         "_iterations":[
+            {
+              "_acknowledgeMode": 0
+            },
+            {
+              "_acknowledgeMode": 1
+            }
+          ],
+          "_clients":
+            QPID.times(numberOfProducers,
+            {
+              "_name": "producingClient__PRODUCING_CLIENT_INDEX",
+              "_connections":[
+                {
+                  "_name": "connection1",
+                  "_factory": "connectionfactory",
+                  "_sessions": [
+                    {
+                      "_sessionName": "session1",
+                      "_producers": [
+                        {
+                          "_name": "Producer__PRODUCING_CLIENT_INDEX",
+                          "_destinationName": queueName,
+                          "_maximumDuration": duration,
+                          "_deliveryMode": 2,
+                          "_messageSize": 1024
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            "__PRODUCING_CLIENT_INDEX")
+            .concat(QPID.times(numberOfConsumers,
+            {
+              "_name": "consumingClient__CONSUMING_CLIENT_INDEX",
+              "_connections":[
+                {
+                  "_name": "connection1",
+                  "_factory": "connectionfactory",
+                  "_sessions": [
+                    {
+                      "_sessionName": "session1",
+                      "_consumers": [
+                        {
+                          "_name": "Consumer__CONSUMING_CLIENT_INDEX",
+                          "_destinationName": queueName,
+                          "_maximumDuration": duration
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            "__CONSUMING_CLIENT_INDEX"))
+        };
+
+        jsonObject._tests= jsonObject._tests.concat(test);
+
+    }
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message