Merge pull request #16 from Informatievlaanderen/chore/3.5.0-alpha-re…

…sults Chore/3.5.0 alpha results
Informatievlaanderen · Nov 8, 2024 · 023f519 · 023f519
2 parents 9da3477 + 223a12d
commit 023f519
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 46 deletions.
diff --git a/load-testing/docker-compose.yml b/load-testing/docker-compose.yml
@@ -28,11 +28,11 @@ services:
   #     - ${PYROSCOPE_PORT:-4040}:4040
   #   networks:
   #     - performance_testing
-  #   healthcheck:
-  #     test: ["CMD", "wget", "-qO-", "http://pyroscope:4040/ready"]
-  #     interval: 12s
-  #     timeout: 3s
-  #     retries: 20
+  #   # healthcheck:
+  #   #   test: ["CMD", "wget", "-qO-", "http://pyroscope:4040/ready"]
+  #   #   interval: 12s
+  #   #   timeout: 3s
+  #   #   retries: 20
 
 
   grafana:
@@ -57,7 +57,7 @@ services:
 
   jmeter-runner:
     container_name: performance_testing_jmeter-runner
-    image: ghcr.io/informatievlaanderen/jmeter-runner:20240424t1412
+    image: ghcr.io/informatievlaanderen/jmeter-runner:20240925t1209
     networks:
       - performance_testing 
     ports:
@@ -80,7 +80,7 @@ services:
       - RUN_TEST_API_KEY=${RUN_TEST_API_KEY:-}
       - CHECK_TEST_API_KEY=${CHECK_TEST_API_KEY:-}
       - DELETE_TEST_API_KEY=${DELETE_TEST_API_KEY:-}
-      - CUSTOM_LABELS=${CUSTOM_LABELS:-threads size type component members_per_page}
+      - CUSTOM_LABELS=${CUSTOM_LABELS:-threads size type component members_per_page views test_plan_name}
     deploy:
       resources:
         limits:
@@ -90,10 +90,11 @@ services:
           cpus: '0.1'
           memory: '0.25GB'
 
+
   load-testing-ldio-workbench-workbench:
     container_name: performance_testing_ldio-workbench
-    image: ghcr.io/informatievlaanderen/ldi-orchestrator:20240814211044
-    # image: ldes/ldi-orchestrator:${LDI_ORCHESTRATOR_TAG:-2.5.1-SNAPSHOT}
+    # image: ldes/ldi-orchestrator:${LDI_ORCHESTRATOR_TAG:-2.10.0-SNAPSHOT}
+    image: ghcr.io/informatievlaanderen/ldi-orchestrator:20241021180535 # TODO: use 2.10
     networks:
       - performance_testing
     ports:
@@ -124,9 +125,10 @@ services:
           cpus: '0.10'
           memory: '0.25GB'
 
+
   ldes-postgres:
-    container_name: ldes-postgres
-    image: postgres:14-alpine
+    container_name: performance_testing_ldes-postgres
+    image: postgres:latest
     ports:
       - 5432:5432
     environment:
@@ -150,13 +152,15 @@ services:
           cpus: '0.50'
           memory: '0.5GB'
 
+
   ldes-server:
     container_name: performance_testing_ldes-server
     # image: ghcr.io/informatievlaanderen/ldes-server:latest
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.3.0-SNAPSHOT} # CrowdScan
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.4.1-SNAPSHOT} # Geomobility
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.10.0-SNAPSHOT} # Telraam
-    image: ldes/ldes-server:${LDES_SERVER_TAG:-3.3.0-SNAPSHOT}
+    # image: ldes/ldes-server:${LDES_SERVER_TAG:-3.4.0-SNAPSHOT}
+    image: ldes/ldes-server:${LDES_SERVER_TAG:-3.5.0-SNAPSHOT}
     networks:
       - performance_testing
     ports:
@@ -182,9 +186,11 @@ services:
       - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PWD}
       - LDESSERVER_HOSTNAME=http://ldes-server:${LDES_SERVER_PORT:-8080}
       - SERVER_PORT=8080
-      - LDESSERVER_RETENTIONCRON=-
-      - LDESSERVER_COMPACTIONCRON=-
-      - LDESSERVER_DELETIONCRON=-
+      - LDESSERVER_MAINTENANCECRON=-
+      # - PYROSCOPE_AGENT_ENABLED=true
+      # - PYROSCOPE_APPLICATION_NAME=ldes-server
+      # - PYROSCOPE_SERVER_ADDRESS=http://pyroscope:4040
+      # - PYROSCOPE_FORMAT=jfr
     deploy:
       resources:
         limits:

diff --git a/load-testing/server/README.md b/load-testing/server/README.md
@@ -1,44 +1,26 @@
 # Server Tests
 
 ```bash
-CATEGORY="Server%20(3.3.0)"
-TEST_SERVER_BASE="http://localhost:9000"
-X_API_KEY=
+cd ./server
+export CATEGORY="Server%20(3.4.0)"
+export TEST_SERVER_BASE="http://localhost:9000"
+export X_API_KEY=
 ```
 
 ```bash
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./ingest.01T.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./ingest.02T.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./ingest.04T.jmx
+./run-ingest-sequential.sh
 ```
 
 ```bash
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fragment.01V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fragment.02V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fragment.04V.jmx
+./run-fragment-sequential.sh
 ```
 
 ```bash
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.01T.01V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.01T.02V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.01T.04V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.02T.01V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.02T.02V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.02T.04V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.04T.01V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.04T.02V.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.04T.04V.jmx
+./run-both-parallel.sh
 ```
 
 ```bash
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.10mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.100mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.250mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.500mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.1000mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.2500mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.5000mpp.jmx
-curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.10000mpp.jmx
+./run-fetch.sh
 ```
 
 ```bash

diff --git a/load-testing/server/both.01T.04V.jmx b/load-testing/server/both.01T.04V.jmx
@@ -24,7 +24,7 @@
           </elementProp>
           <elementProp name="views" elementType="Argument">
             <stringProp name="Argument.name">views</stringProp>
-            <stringProp name="Argument.value">2</stringProp>
+            <stringProp name="Argument.value">4</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="type" elementType="Argument">

diff --git a/load-testing/server/fetch.10000mpp.jmx b/load-testing/server/fetch.10000mpp.jmx
@@ -5002,9 +5002,9 @@ _:Bf6cae0b2dd40d76d100e5e8773cd0d8d &lt;http://www.w3.org/1999/02/22-rdf-syntax-
         </collectionProp>
       </Arguments>
       <hashTree/>
-      <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+      <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults">
         <intProp name="HTTPSampler.connect_timeout">3000</intProp>
-        <intProp name="HTTPSampler.response_timeout">5000</intProp>
+        <intProp name="HTTPSampler.response_timeout">10000</intProp>
         <stringProp name="HTTPSampler.domain">${hostname}</stringProp>
         <stringProp name="HTTPSampler.port">${port}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding">utf8</stringProp>
@@ -5671,7 +5671,7 @@ log.info(&quot;fetch_starttime: &quot; + props.get(&quot;fragmentation_starttime
           <boolProp name="CounterConfig.per_user">false</boolProp>
         </CounterConfig>
         <hashTree/>
-        <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Set view name">
+        <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Set view name" enabled="true">
           <stringProp name="scriptLanguage">groovy</stringProp>
           <stringProp name="parameters"></stringProp>
           <stringProp name="filename"></stringProp>
@@ -5731,7 +5731,7 @@ vars.put(&quot;view_name&quot;, view_name);
           <hashTree/>
         </hashTree>
       </hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test - Calculate fetch timing" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test - Calculate fetch timing">
         <intProp name="ThreadGroup.num_threads">1</intProp>
         <intProp name="ThreadGroup.ramp_time">1</intProp>
         <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>

diff --git a/load-testing/server/results.xlsx b/load-testing/server/results.xlsx
diff --git a/load-testing/server/run-both-parallel.sh b/load-testing/server/run-both-parallel.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.01T.01V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.01T.02V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.01T.04V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.02T.01V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.02T.02V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.02T.04V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.04T.01V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.04T.02V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./both.04T.04V.jmx
diff --git a/load-testing/server/run-fetch.sh b/load-testing/server/run-fetch.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.10mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.100mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.250mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.500mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.1000mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.2500mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.5000mpp.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fetch.10000mpp.jmx
diff --git a/load-testing/server/run-fragment-sequential.sh b/load-testing/server/run-fragment-sequential.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fragment.01V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fragment.02V.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./fragment.04V.jmx
diff --git a/load-testing/server/run-ingest-sequential.sh b/load-testing/server/run-ingest-sequential.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./ingest.01T.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./ingest.02T.jmx
+curl -X POST "$TEST_SERVER_BASE/test?category=$CATEGORY" -H "x-api-key: $X_API_KEY" -H "Content-Type: application/xml" --data-binary @./ingest.04T.jmx
diff --git a/load-testing/setup.sh b/load-testing/setup.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+clear
+docker compose up -d --wait
diff --git a/load-testing/teardown.sh b/load-testing/teardown.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose down