From 7fa761e93cc4ead764fa085324b747b479589333 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Sun, 7 Feb 2021 16:37:30 +0100
Subject: [PATCH] Add different connection string for internal and external
access to kafka and zookeeper
---
.../execution/TheodoliteExecutor.kt | 8 +++++---
.../kotlin/theodolite/k8s/UC1Benchmark.kt | 20 ++++++++++---------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index 9ac29a862..2b3e0f726 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -20,9 +20,11 @@ class TheodoliteExecutor() {
private fun loadConfig(): Config {
logger.info { resourcesPath }
val benchmark: UC1Benchmark = UC1Benchmark(
- UC1Benchmark.UC1BenchmarkConfig( // use port forward 2181 -> 2181
- zookeeperConnectionString = "localhost:2181", //"my-confluent-cp-zookeeper:2181", //localhost:2181.
- kafkaIPConnectionString = "localhost:9092",//"my-confluent-cp-kafka:","178.18.0."
+ UC1Benchmark.UC1BenchmarkConfig(
+ clusterZookeeperConnectionString = "my-confluent-cp-zookeeper:2181",
+ clusterKafkaConnectionString = "localhost:9092",
+ externalZookeeperConnectionString = "localhost:2181",
+ externalKafkaConnectionString = "localhost:9092",
schemaRegistryConnectionString = "http://my-confluent-cp-schema-registry:8081",
kafkaPartition = 40,
kafkaReplication = 1,
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt
index c8766c2fa..bab247d75 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt
@@ -29,8 +29,8 @@ class UC1Benchmark(config: UC1BenchmarkConfig) : Benchmark(config) {
init {
this.workloadGeneratorStateCleaner =
- WorkloadGeneratorStateCleaner(this.config.zookeeperConnectionString, path = "/workload-generation")
- this.topicManager = TopicManager(this.config.kafkaIPConnectionString)
+ WorkloadGeneratorStateCleaner(this.config.externalZookeeperConnectionString, path = "/workload-generation")
+ this.topicManager = TopicManager(this.config.externalKafkaConnectionString)
this.kubernetesClient = DefaultKubernetesClient().inNamespace("default")
this.yamlLoader = YamlLoader(this.kubernetesClient)
this.deploymentManager = DeploymentManager(this.kubernetesClient)
@@ -63,8 +63,8 @@ class UC1Benchmark(config: UC1BenchmarkConfig) : Benchmark(config) {
// set environment variables
val environmentVariables: MutableMap<String, String> = mutableMapOf()
- //environmentVariables.put("KAFKA_BOOTSTRAP_SERVERS", this.config.kafkaIPConnectionString)
- //environmentVariables.put("SCHEMA_REGISTRY_URL", this.config.schemaRegistryConnectionString)
+ environmentVariables.put("KAFKA_BOOTSTRAP_SERVERS", this.config.clusterKafkaConnectionString)
+ environmentVariables.put("SCHEMA_REGISTRY_URL", this.config.schemaRegistryConnectionString)
// setup deployment
@@ -85,9 +85,9 @@ class UC1Benchmark(config: UC1BenchmarkConfig) : Benchmark(config) {
// TODO ("calculate number of required instances")
val requiredInstances = 1
val environmentVariables: MutableMap<String, String> = mutableMapOf()
- //environmentVariables.put("KAFKA_BOOTSTRAP_SERVERS", this.config.kafkaIPConnectionString)
- //environmentVariables.put("ZK_HOST", this.config.zookeeperConnectionString.split(":")[0])
- //environmentVariables.put("ZK_PORT", this.config.zookeeperConnectionString.split(":")[1])
+ environmentVariables.put("KAFKA_BOOTSTRAP_SERVERS", this.config.clusterKafkaConnectionString)
+ environmentVariables.put("ZK_HOST", this.config.clusterZookeeperConnectionString.split(":")[0])
+ environmentVariables.put("ZK_PORT", this.config.clusterZookeeperConnectionString.split(":")[1])
environmentVariables["NUM_SENSORS"] = load.get().toString()
environmentVariables["INSTANCES"] = requiredInstances.toString()
@@ -96,8 +96,10 @@ class UC1Benchmark(config: UC1BenchmarkConfig) : Benchmark(config) {
}
data class UC1BenchmarkConfig(
- val zookeeperConnectionString: String,
- val kafkaIPConnectionString: String,
+ val clusterZookeeperConnectionString: String,
+ val clusterKafkaConnectionString: String,
+ val externalZookeeperConnectionString: String,
+ val externalKafkaConnectionString: String,
val schemaRegistryConnectionString: String,
val kafkaTopics: List<String>,
val kafkaReplication: Short,
--
GitLab