From d0e5ba92d3852253521fdd227965b89f9c810f68 Mon Sep 17 00:00:00 2001 From: Ranko Orlic Date: Tue, 21 May 2024 20:06:58 +0200 Subject: [PATCH] fix: fetch tests write to stats.xml, both ingest and fragmentation statistics --- load-testing/server/fetch.1000mpp.jmx | 44 ++++++++++------- load-testing/server/fetch.100mpp.jmx | 44 ++++++++++------- load-testing/server/fetch.10mpp.jmx | 70 +++++++++++++++------------ load-testing/server/fetch.250mpp.jmx | 44 ++++++++++------- load-testing/server/fetch.25mpp.jmx | 52 ++++++++++++-------- load-testing/server/fetch.500mpp.jmx | 44 ++++++++++------- load-testing/server/fetch.50mpp.jmx | 46 +++++++++++------- 7 files changed, 207 insertions(+), 137 deletions(-) diff --git a/load-testing/server/fetch.1000mpp.jmx b/load-testing/server/fetch.1000mpp.jmx index 4ff7021..a3be3d7 100644 --- a/load-testing/server/fetch.1000mpp.jmx +++ b/load-testing/server/fetch.1000mpp.jmx @@ -99,7 +99,7 @@ - + /admin/api/v1/eventstreams true POST @@ -132,7 +132,17 @@ - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + ${total_member_count} @@ -261,12 +271,12 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy @@ -439,21 +449,21 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; @@ -485,7 +495,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml diff --git a/load-testing/server/fetch.100mpp.jmx b/load-testing/server/fetch.100mpp.jmx index 97b5184..db1899c 100644 --- a/load-testing/server/fetch.100mpp.jmx +++ b/load-testing/server/fetch.100mpp.jmx @@ -80,7 +80,7 @@ HttpClient4 - + 1 true continue @@ -132,7 +132,17 @@ - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + ${total_member_count} @@ -261,12 +271,12 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy @@ -439,21 +449,21 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; @@ -485,7 +495,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml diff --git a/load-testing/server/fetch.10mpp.jmx b/load-testing/server/fetch.10mpp.jmx index f0b850b..77945fe 100644 --- a/load-testing/server/fetch.10mpp.jmx +++ b/load-testing/server/fetch.10mpp.jmx @@ -132,8 +132,18 @@ - - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + + ${total_member_count} @@ -155,7 +165,7 @@ - + 6 /observations POST @@ -222,7 +232,7 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 HttpClient4 - + false saveConfig @@ -261,15 +271,15 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy - + ${__groovy(vars.get("get_last_page_result") != "200")} @@ -282,7 +292,7 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + /${ldes_name}/${view_name}?pageNumber=${total_page_count} true GET @@ -293,7 +303,7 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + Assertion.response_data @@ -301,7 +311,7 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 16 - + code get_last_page_result (\d+) @@ -311,7 +321,7 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 1 - + groovy @@ -439,25 +449,25 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; - + false saveConfig @@ -485,12 +495,12 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml - + true 1 600 @@ -520,7 +530,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe false - + 6 /${ldes_name}/${view_name}?pageNumber=${page} GET @@ -531,7 +541,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe HttpClient4 - + false saveConfig @@ -570,7 +580,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe - + 1 1 true @@ -581,7 +591,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe - + 90000 /admin/api/v1/eventstreams/${ldes_name} true diff --git a/load-testing/server/fetch.250mpp.jmx b/load-testing/server/fetch.250mpp.jmx index 9f29fd2..ec4de8f 100644 --- a/load-testing/server/fetch.250mpp.jmx +++ b/load-testing/server/fetch.250mpp.jmx @@ -99,7 +99,7 @@ - + /admin/api/v1/eventstreams true POST @@ -132,7 +132,17 @@ - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + ${total_member_count} @@ -261,12 +271,12 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy @@ -439,21 +449,21 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; @@ -485,7 +495,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml diff --git a/load-testing/server/fetch.25mpp.jmx b/load-testing/server/fetch.25mpp.jmx index 764c1ea..06e3985 100644 --- a/load-testing/server/fetch.25mpp.jmx +++ b/load-testing/server/fetch.25mpp.jmx @@ -99,7 +99,7 @@ - + /admin/api/v1/eventstreams true POST @@ -116,7 +116,7 @@ - + /admin/api/v1/eventstreams/${ldes_name}/views true POST @@ -132,7 +132,17 @@ - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + ${total_member_count} @@ -261,15 +271,15 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy - + ${__groovy(vars.get("get_last_page_result") != "200")} @@ -311,7 +321,7 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 1 - + groovy @@ -439,25 +449,25 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; - + false saveConfig @@ -485,7 +495,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml diff --git a/load-testing/server/fetch.500mpp.jmx b/load-testing/server/fetch.500mpp.jmx index 5aa2571..342539c 100644 --- a/load-testing/server/fetch.500mpp.jmx +++ b/load-testing/server/fetch.500mpp.jmx @@ -99,7 +99,7 @@ - + /admin/api/v1/eventstreams true POST @@ -132,7 +132,17 @@ - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + ${total_member_count} @@ -261,12 +271,12 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy @@ -439,21 +449,21 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; @@ -485,7 +495,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml diff --git a/load-testing/server/fetch.50mpp.jmx b/load-testing/server/fetch.50mpp.jmx index ec06993..dad9685 100644 --- a/load-testing/server/fetch.50mpp.jmx +++ b/load-testing/server/fetch.50mpp.jmx @@ -99,7 +99,7 @@ - + /admin/api/v1/eventstreams true POST @@ -132,7 +132,17 @@ - + + + groovy + + + true + vars.put("starttime", String.valueOf(System.currentTimeMillis())); + + + + ${total_member_count} @@ -261,12 +271,12 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - - groovy - - + true - vars.put("fragmentation_starttime", String.valueOf(System.currentTimeMillis())) + + + vars.put("ingest_endtime", String.valueOf(System.currentTimeMillis())); + groovy @@ -439,25 +449,25 @@ _:B56e84f09X2D89aeX2D4f0fX2Dbd18X2D80ec0e031082 <http://www.w3.org/1999/02/22 - + groovy true - log.info("starting fragmentation analysis"); -log.info("start: " + vars.get("fragmentation_starttime")); -log.info("end: " + vars.get("fragmentation_endtime")); + def start = vars.get("starttime") as long; +def ingest_end = vars.get("ingest_endtime") as long; +def fragmentation_end = vars.get("fragmentation_endtime") as long; -def start = vars.get("fragmentation_starttime") as long; -def end = vars.get("fragmentation_endtime") as long; -def time = end - start; -def perSecond = ${total_member_count} / time * 1000 as int; +def ingest_time = ingest_end - start; +def ingestedPerSecond = ${total_member_count} / ingest_time * 1000 as int; +def fragmentation_time = fragmentation_end - start; +def fragmentedPerSecond = ${total_member_count} / fragmentation_time * 1000 as int; -return "\n\t\tFragmentation time: " + time + " ms (" + perSecond + " per second)"; +return "\n\t\tIngest time: " + ingest_time + " ms (" + ingestedPerSecond + " per second)" + "\n\t\tFragmentation time: " + fragmentation_time + " ms (" + fragmentedPerSecond + " per second)"; - + false saveConfig @@ -485,7 +495,7 @@ return "\n\t\tFragmentation time: " + time + " ms (" + perSe 0 - results/time_interval.xml + stats.xml