From c7238681dbbb5c4140f97b13f706171b0abbd4b9 Mon Sep 17 00:00:00 2001
From: Simon Ehrenstein <simon.ehrenstein@gmail.com>
Date: Sun, 7 Feb 2021 16:44:37 +0100
Subject: [PATCH] Fix kafka connection string
---
.../kotlin/theodolite/execution/TheodoliteExecutor.kt | 9 +++------
.../src/main/kotlin/theodolite/k8s/UC1Benchmark.kt | 2 +-
.../src/main/kotlin/theodolite/util/AbstractBenchmark.kt | 6 ++----
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index 2b3e0f726..ed5a65159 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -5,10 +5,7 @@ import theodolite.k8s.UC1Benchmark
import theodolite.strategies.restriction.LowerBoundRestriction
import theodolite.strategies.searchstrategy.CompositeStrategy
import theodolite.strategies.searchstrategy.LinearSearch
-import theodolite.util.Config
-import theodolite.util.LoadDimension
-import theodolite.util.Resource
-import theodolite.util.Results
+import theodolite.util.*
import java.nio.file.Paths
import java.time.Duration
@@ -20,9 +17,9 @@ class TheodoliteExecutor() {
private fun loadConfig(): Config {
logger.info { resourcesPath }
val benchmark: UC1Benchmark = UC1Benchmark(
- UC1Benchmark.UC1BenchmarkConfig(
+ AbstractBenchmark.Config(
clusterZookeeperConnectionString = "my-confluent-cp-zookeeper:2181",
- clusterKafkaConnectionString = "localhost:9092",
+ clusterKafkaConnectionString = "my-confluent-cp-kafka:9092",
externalZookeeperConnectionString = "localhost:2181",
externalKafkaConnectionString = "localhost:9092",
schemaRegistryConnectionString = "http://my-confluent-cp-schema-registry:8081",
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt
index 3f605b0bc..bebd07904 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt
@@ -12,7 +12,7 @@ import theodolite.util.Resource
private val logger = KotlinLogging.logger {}
-class UC1Benchmark(config: AbstractBenchmarkConfig) : AbstractBenchmark(config) {
+class UC1Benchmark(config: Config) : AbstractBenchmark(config) {
private val workloadGeneratorStateCleaner: WorkloadGeneratorStateCleaner
private val topicManager: TopicManager
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt
index 5dca9126c..2411e1b8b 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt
@@ -1,8 +1,6 @@
package theodolite.util
-import theodolite.k8s.UC1Benchmark
-
-abstract class AbstractBenchmark(val config: AbstractBenchmarkConfig): Benchmark {
+abstract class AbstractBenchmark(val config: Config): Benchmark {
override fun start(load: LoadDimension, resources: Resource) {
this.clearClusterEnvironment()
this.initializeClusterEnvironment()
@@ -10,7 +8,7 @@ abstract class AbstractBenchmark(val config: AbstractBenchmarkConfig): Benchmark
this.startWorkloadGenerator(load)
}
- data class AbstractBenchmarkConfig(
+ data class Config(
val clusterZookeeperConnectionString: String,
val clusterKafkaConnectionString: String,
val externalZookeeperConnectionString: String,
--
GitLab