From 904922338e8254fff2b82abc8c471aa54b972dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Mon, 23 Aug 2021 19:10:18 +0200
Subject: [PATCH] Enable check of load type for percentage lag trend
The percentage lag trend is at the moment only available for the NumSensors
load type, because for NumNestedGroups it makes no sense.
---
.../theodolite/evaluation/SloCheckerFactory.kt | 12 +++++++++---
.../theodolite/execution/TheodoliteExecutor.kt | 3 +++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt b/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt
index 394f4c9a4..68e5abc6b 100644
--- a/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt
@@ -27,19 +27,25 @@ class SloCheckerFactory {
): SloChecker {
return when (sloType) {
"lag trend" -> ExternalSloChecker(
- externalSlopeURL = properties["externalSloUrl"] ?: throw IllegalArgumentException("externalSloUrl expected"),
+ externalSlopeURL = properties["externalSloUrl"]
+ ?: throw IllegalArgumentException("externalSloUrl expected"),
threshold = properties["threshold"]?.toInt() ?: throw IllegalArgumentException("threshold expected"),
warmup = properties["warmup"]?.toInt() ?: throw IllegalArgumentException("warmup expected")
)
"lag trend percent" -> {
- var thresholdPercent = properties["percent"]?.toInt() ?: throw IllegalArgumentException("percent for threshold expected")
+ if (!properties["loadType"].equals("NumSensors")) {
+ throw IllegalArgumentException("Percent Threshold is only allowed with load type NumSensors")
+ }
+ var thresholdPercent =
+ properties["percent"]?.toInt() ?: throw IllegalArgumentException("percent for threshold expected")
if (thresholdPercent < 0 || thresholdPercent > 100) {
throw IllegalArgumentException("Threshold percent need to be an Int in the range between 0 and 100 (inclusive)")
}
var threshold = (load.get() / 100.0 * thresholdPercent).toInt()
ExternalSloChecker(
- externalSlopeURL = properties["externalSloUrl"] ?: throw IllegalArgumentException("externalSloUrl expected"),
+ externalSlopeURL = properties["externalSloUrl"]
+ ?: throw IllegalArgumentException("externalSloUrl expected"),
threshold = threshold,
warmup = properties["warmup"]?.toInt() ?: throw IllegalArgumentException("warmup expected")
)
diff --git a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index f5054dc2d..bc9371763 100644
--- a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -55,6 +55,9 @@ class TheodoliteExecutor(
this.kubernetesBenchmark.loadTypes
)
+ // Add load type to check if the percentage lag trend is applicable
+ config.slos.forEach { it.properties["loadType"] = config.load.loadType }
+
executor =
BenchmarkExecutorImpl(
benchmark = kubernetesBenchmark,
--
GitLab