jmeter wip

jameshnsears · Jan 23, 2019 · c053cc7 · c053cc7
1 parent b70bd45
commit c053cc7
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -16,18 +16,11 @@ Featuring:
 ### 2.2. CLI 
 * populate xqa-shard(s) and xqa-db using xqa-test-data:
 ```
-docker-compose up -d xqa-message-broker xqa-db xqa-db-amqp xqa-ingest-balancer
-
-docker-compose up -d --scale xqa-shard=2
-
-docker run -d --net="xqa-query-balancer_xqa" --name="xqa-ingest" -v $HOME/GIT_REPOS/xqa-test-data:/xml jameshnsears/xqa-ingest:latest -message_broker_host xqa-message-broker -path /xml
+./start.sh
 ```
 * wait until data in xqa:
     * docker logs xqa-ingest | grep "FINISHED - sent: 40/40"
-    * docker-compose logs xqa-shard | grep "size="
-```
-docker run -d --net="xqa-query-balancer_xqa" --name="xqa-query-balancer" -p9090:9090 -p9091:9091 xqa-query-balancer 
-```
+    * docker-compose logs -f xqa-shard | grep "size="
 
 ### 2.2.1. Search
 ```
@@ -64,7 +57,9 @@ docker run -d --net="xqa-query-balancer_xqa" --name="xqa-query-balancer" -p9090:
 * curl -X POST http://127.0.0.1:9091/tasks/gc
 
 ## 3. Teardown
-* docker-compose down -v
+```
+./stop.sh
+```
 
 ## 4. Useful storage commands
 ## 4.1. BaseX

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,9 @@ services:
     build: .
     image: xqa-query-balancer
     container_name: xqa-query-balancer
+    ports:
+      - "9090:9090"
+      - "9091:9091"
     networks:
       - xqa
     depends_on:
@@ -61,15 +64,6 @@ services:
     depends_on:
       - xqa-message-broker
 
-  xqa-ingest:
-    image: jameshnsears/xqa-ingest
-    container_name: xqa-ingest
-    command: ["-message_broker_host", "xqa-message-broker"]
-    depends_on:
-      - xqa-message-broker
-    networks:
-      - xqa
-
 volumes:
   xqa-db:
   xqa-message-broker:

diff --git a/jmeter-test-plan.jmx b/jmeter-test-plan.jmx
@@ -88,7 +88,8 @@
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="-795420727">&quot;serviceId&quot;:&quot;/xml/DBER-1923-0416.xml&quot;,</stringProp>
+              <stringProp name="1325712165">&quot;subject&quot;:&quot;/xml/DBER-1923-0416.xml&quot;,ee</stringProp>
+              <stringProp name="0"></stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
@@ -97,12 +98,51 @@
           </ResponseAssertion>
           <hashTree/>
           <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor" enabled="true">
-            <stringProp name="JSONPostProcessor.referenceNames">serviceId</stringProp>
-            <stringProp name="JSONPostProcessor.jsonPathExprs">$..serviceId</stringProp>
+            <stringProp name="JSONPostProcessor.referenceNames">serviceId; digest; filename</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$..serviceId; $..digest; $..filename</stringProp>
             <stringProp name="JSONPostProcessor.match_numbers"></stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">serviceId; digest; filename</stringProp>
           </JSONPostProcessor>
           <hashTree/>
         </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="/search/digest/${digest}" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/search/digest/${digest}</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="/search/service/${serviceId}" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/search/service/${serviceId}</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree/>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="/xquery/" enabled="false">
           <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">

diff --git a/jmeter.log b/jmeter.log
diff --git a/start.sh b/start.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+docker-compose -f docker-compose.yml up -d xqa-message-broker xqa-db xqa-db-amqp xqa-ingest-balancer
+
+docker-compose -f docker-compose.yml up -d --scale xqa-shard=2
+
+docker run -d --net="xqa-query-balancer_xqa" --name="xqa-ingest" -v $HOME/GIT_REPOS/xqa-test-data:/xml jameshnsears/xqa-ingest:latest -message_broker_host xqa-message-broker -path /xml
+
diff --git a/stop.sh b/stop.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+docker rm -f xqa-ingest
+
+docker-compose down -v