diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt index d088f8d46b62f2ed3accbf34b66e8d98be3e4332..cd85c143e3c416f115a4d301629caf4d46b7459f 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt @@ -39,12 +39,11 @@ class BenchmarkExecutorImpl( * Analyse the experiment, if [run] is true, otherwise the experiment was canceled by the user. */ if (this.run.get()) { - result = - AnalysisExecutor(slo = slo, executionId = executionId).analyze( - load = load, - res = res, - executionDuration = executionDuration - ) + result = AnalysisExecutor(slo = slo, executionId = executionId).analyze( + load = load, + res = res, + executionDuration = executionDuration + ) this.results.setResult(Pair(load, res), result) } @@ -52,7 +51,7 @@ class BenchmarkExecutorImpl( benchmarkDeployment.teardown() } catch (e: Exception) { logger.warn { "Error while tearing down the benchmark deployment." } - logger.debug { "Teardown failed, caused by: $e " } + logger.debug { "Teardown failed, caused by: $e" } } return result diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt index 09806e7b0100fa00d94645c25084f56c65400361..88424f003695d41f254b67ddeea5800460bda2c6 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt @@ -46,7 +46,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) { val label = resource.spec.selector.matchLabels["app"]!! this.client.apps().deployments().delete(resource) blockUntilPodDeleted(label) - logger.info { "Deployment '$resource' deleted." } + logger.info { "Deployment '${resource.metadata.name}' deleted." } } is Service -> this.client.services().delete(resource) @@ -56,7 +56,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) { val label = resource.spec.selector.matchLabels["app"]!! this.client.apps().statefulSets().delete(resource) blockUntilPodDeleted(label) - logger.info { "StatefulSet '$resource' deleted." } + logger.info { "StatefulSet '$resource.metadata.name' deleted." } } is ServiceMonitorWrapper -> resource.delete(client) else -> throw IllegalArgumentException("Unknown Kubernetes resource.") diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt index ee806a128b79b935e05b81e742e082f216bdb670..13bfedfe055f2bd428137f89b2986f3967ec797c 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt @@ -11,6 +11,7 @@ import theodolite.util.Results * @param results [Result] object used as a basis to restrict the resources. */ class LowerBoundRestriction(results: Results) : RestrictionStrategy(results) { + override fun apply(load: LoadDimension, resources: List<Resource>): List<Resource> { val maxLoad: LoadDimension? = this.results.getMaxBenchmarkedLoad(load) var lowerBound: Resource? = this.results.getMinRequiredInstances(maxLoad) @@ -19,4 +20,5 @@ class LowerBoundRestriction(results: Results) : RestrictionStrategy(results) { } return resources.filter { x -> x.get() >= lowerBound.get() } } + }