From df0812d6dcf40b1efda67cd8919b663c0dda5a7f Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Wed, 24 Mar 2021 11:59:26 +0100
Subject: [PATCH] Improve logic of theodolite operator
---
.../execution/TheodoliteController.kt | 69 ++++++++++++-------
.../execution/TheodoliteExecutor.kt | 54 ++++++++++++---
2 files changed, 89 insertions(+), 34 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteController.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteController.kt
index f33ef0a28..3e6496572 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteController.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteController.kt
@@ -6,6 +6,8 @@ import io.fabric8.kubernetes.client.informers.SharedInformer
import mu.KotlinLogging
import theodolite.benchmark.BenchmarkExecution
import theodolite.benchmark.KubernetesBenchmark
+import java.util.Queue
+import java.util.LinkedList
private val logger = KotlinLogging.logger {}
@@ -15,10 +17,9 @@ class TheodoliteController(
val informerBenchmarkExecution: SharedInformer<BenchmarkExecution>,
val informerBenchmarkType: SharedInformer<KubernetesBenchmark>
) {
- var execution: BenchmarkExecution? = null
- var benchmarkType: KubernetesBenchmark? = null
- var executor: TheodoliteExecutor? = null
- var updated: Boolean = true
+ var executor: TheodoliteExecutor = TheodoliteExecutor()
+ val executionsQueue: Queue<BenchmarkExecution> = LinkedList<BenchmarkExecution>()
+ val benchmarks: MutableMap<String, KubernetesBenchmark> = HashMap()
/**
* Adds the EventHandler to kubernetes
@@ -27,33 +28,48 @@ class TheodoliteController(
informerBenchmarkExecution.addEventHandler(object : ResourceEventHandler<BenchmarkExecution> {
override fun onAdd(benchmarkExecution: BenchmarkExecution) {
- execution = benchmarkExecution
+ executionsQueue.add(benchmarkExecution)
}
override fun onUpdate(oldExecution: BenchmarkExecution, newExecution: BenchmarkExecution) {
- execution = newExecution
- updated = true
- shutdown()
+ if (executor.getExecution().name == newExecution.name) {
+ executor.stop()
+ executor.setExecution(newExecution)
+ executor.run()
+ } else {
+ executionsQueue.remove(oldExecution)
+ onAdd(newExecution)
+ }
}
- override fun onDelete(benchmarkExecution: BenchmarkExecution, b: Boolean) {
- shutdown()
+ override fun onDelete(execution: BenchmarkExecution, b: Boolean) {
+ if (executor.getExecution().name == execution.name) {
+ executor.stop()
+ } else {
+ executionsQueue.remove(execution)
+ }
}
})
informerBenchmarkType.addEventHandler(object : ResourceEventHandler<KubernetesBenchmark> {
override fun onAdd(kubernetesBenchmark: KubernetesBenchmark) {
- benchmarkType = kubernetesBenchmark
+ benchmarks[kubernetesBenchmark.name] = kubernetesBenchmark
}
override fun onUpdate(oldBenchmark: KubernetesBenchmark, newBenchmark: KubernetesBenchmark) {
- benchmarkType = newBenchmark
- updated = true
- shutdown()
+ onAdd(newBenchmark)
+ if (executor.getBenchmark().name == oldBenchmark.name) {
+ executor.stop()
+ executor.setBenchmark(newBenchmark)
+ executor.run()
+ }
}
- override fun onDelete(kubernetesBenchmark: KubernetesBenchmark, b: Boolean) {
- shutdown()
+ override fun onDelete(benchmark: KubernetesBenchmark, b: Boolean) {
+ benchmarks.remove(benchmark.name)
+ if(executor.getBenchmark().name == benchmark.name) {
+ executor.stop()
+ }
}
})
}
@@ -70,17 +86,18 @@ class TheodoliteController(
@Synchronized
private fun reconcile() {
- val localExecution = this.execution
- val localType = this.benchmarkType
-
- if (localType is KubernetesBenchmark && localExecution is BenchmarkExecution && updated) {
- executor = TheodoliteExecutor(config = localExecution, kubernetesBenchmark = localType)
- executor!!.run()
- updated = false
+ while(executionsQueue.isNotEmpty() && !executor.isRunning) {
+ val execution = executionsQueue.poll()
+ val benchmark = benchmarks[execution.name]
+ if (benchmark == null) {
+ logger.error { "No benchmark found for execution ${execution.name}" }
+ executionsQueue.add(execution)
+ } else {
+ executor.setExecution(execution)
+ executor.setBenchmark(benchmark)
+ executor.run()
+ }
}
}
- private fun shutdown() {
- Shutdown(benchmarkExecution = execution!!, benchmark = benchmarkType!!).run()
- }
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index 38ea07abb..14d492c96 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -1,5 +1,6 @@
package theodolite.execution
+import mu.KotlinLogging
import theodolite.benchmark.BenchmarkExecution
import theodolite.benchmark.KubernetesBenchmark
import theodolite.patcher.PatcherDefinitionFactory
@@ -10,11 +11,29 @@ import theodolite.util.LoadDimension
import theodolite.util.Resource
import theodolite.util.Results
import java.time.Duration
+import kotlin.system.exitProcess
+
+
+private val logger = KotlinLogging.logger {}
+
class TheodoliteExecutor(
- private val config: BenchmarkExecution,
- private val kubernetesBenchmark: KubernetesBenchmark
+ private var config: BenchmarkExecution,
+ private var kubernetesBenchmark: KubernetesBenchmark
) {
+ private val executionThread = Thread {
+ if(config == null || kubernetesBenchmark == null) {
+ logger.error { "Execution or Benchmark not found" }
+ }else {
+ val config = buildConfig()
+ // execute benchmarks for each load
+ for (load in config.loads) {
+ config.compositeStrategy.findSuitableResource(load, config.resources)
+ }
+ }
+ }
+
+ var isRunning = false
private fun buildConfig(): Config {
val results = Results()
@@ -62,12 +81,31 @@ class TheodoliteExecutor(
)
}
+ fun getExecution(): BenchmarkExecution {
+ return this.config
+ }
+
+ fun getBenchmark(): KubernetesBenchmark {
+ return this.kubernetesBenchmark
+ }
+
fun run() {
- val config = buildConfig()
+ isRunning = true
+ executionThread.run()
+ }
+
+ fun stop() {
+ isRunning = false
+ executionThread.interrupt()
+ }
+
+ fun setExecution(config: BenchmarkExecution) {
+ this.config = config
+ }
+ fun setBenchmark(benchmark: KubernetesBenchmark) {
+ this.kubernetesBenchmark = benchmark
+ }
+
+ constructor() {}
- // execute benchmarks for each load
- for (load in config.loads) {
- config.compositeStrategy.findSuitableResource(load, config.resources)
- }
}
-}
--
GitLab