From 7c23f6bb9e8243a9daed10cd5519c5c0a9ba639d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 24 Feb 2022 18:57:21 +0100
Subject: [PATCH] Fix afterAction for Strimzi Zookeeper
---
.../uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml | 7 +++----
.../uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml | 7 +++----
.../uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml | 7 +++----
.../uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml | 7 +++----
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
index 912bcf954..1677402fc 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
@@ -15,11 +15,10 @@ spec:
- selector: # delete zookeeper nodes to reset zookeeper
pod:
matchLabels:
- app: "cp-zookeeper"
- container: "cp-zookeeper-server"
+ app: "zookeeper-client"
+ container: "zookeeper-client"
exec:
- command: ["zookeeper-shell", "localhost:2181",
- "deleteall", "/app-theodolite-uc1-application-1"]
+ command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc1-application-1"]
timeoutSeconds: 60
loadGenerator:
resources:
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
index 1702c025a..2a52ef26a 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
@@ -33,11 +33,10 @@ spec:
- selector: # delete zookeeper nodes to reset zookeeper
pod:
matchLabels:
- app: "cp-zookeeper"
- container: "cp-zookeeper-server"
+ app: "zookeeper-client"
+ container: "zookeeper-client"
exec:
- command: ["zookeeper-shell", "localhost:2181",
- "deleteall", "/app-theodolite-uc2-application-1"]
+ command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc2-application-1"]
timeoutSeconds: 60
loadGenerator:
resources:
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
index 52e1f9a3a..314b5037c 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
@@ -15,11 +15,10 @@ spec:
- selector: # delete zookeeper nodes to reset zookeeper
pod:
matchLabels:
- app: "cp-zookeeper"
- container: "cp-zookeeper-server"
+ app: "zookeeper-client"
+ container: "zookeeper-client"
exec:
- command: ["zookeeper-shell", "localhost:2181",
- "deleteall", "/app-theodolite-uc3-application-1"]
+ command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc3-application-1"]
timeoutSeconds: 60
loadGenerator:
resources:
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
index aae76e2cf..cc12390f5 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
@@ -15,11 +15,10 @@ spec:
- selector: # delete zookeeper nodes to reset zookeeper
pod:
matchLabels:
- app: "cp-zookeeper"
- container: "cp-zookeeper-server"
+ app: "zookeeper-client"
+ container: "zookeeper-client"
exec:
- command: ["zookeeper-shell", "localhost:2181",
- "deleteall", "/app-theodolite-uc4-application-1"]
+ command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc4-application-1"]
timeoutSeconds: 60
loadGenerator:
resources:
--
GitLab