From bb51cad714bad1ba54ab9ac60a5bca3782319a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <post@soeren-henning.de>
Date: Tue, 15 Sep 2020 13:53:41 +0200
Subject: [PATCH] Simplify deletion of ZooKeeper state
---
execution/run_uc1.sh | 21 +++------------------
execution/run_uc2.sh | 21 +++------------------
execution/run_uc3.sh | 21 +++------------------
execution/run_uc4.sh | 21 +++------------------
4 files changed, 12 insertions(+), 72 deletions(-)
diff --git a/execution/run_uc1.sh b/execution/run_uc1.sh
index 7dc0e4e97..e6a3eb05e 100755
--- a/execution/run_uc1.sh
+++ b/execution/run_uc1.sh
@@ -90,25 +90,10 @@ echo "Finish topic deletion, print topics:"
echo "Delete ZooKeeper configurations used for workload generation"
kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
do
- IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
- found=0
- for element in "${array[@]}"
- do
- if [ "$element" == "workload-generation" ]; then
- found=1
- break
- fi
- done
- if [ $found -ne 1 ]; then
- echo "ZooKeeper reset was successful."
- break
- else
- echo "ZooKeeper reset was not successful. Retrying in 5s."
- sleep 5s
- fi
+ echo "Wait for ZooKeeper state deletion."
+ sleep 5s
done
echo "Deletion finished"
diff --git a/execution/run_uc2.sh b/execution/run_uc2.sh
index c294e735b..76d76cd4d 100755
--- a/execution/run_uc2.sh
+++ b/execution/run_uc2.sh
@@ -89,25 +89,10 @@ echo "Finish topic deletion, print topics:"
echo "Delete ZooKeeper configurations used for workload generation"
kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
do
- IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
- found=0
- for element in "${array[@]}"
- do
- if [ "$element" == "workload-generation" ]; then
- found=1
- break
- fi
- done
- if [ $found -ne 1 ]; then
- echo "ZooKeeper reset was successful."
- break
- else
- echo "ZooKeeper reset was not successful. Retrying in 5s."
- sleep 5s
- fi
+ echo "Wait for ZooKeeper state deletion."
+ sleep 5s
done
echo "Deletion finished"
diff --git a/execution/run_uc3.sh b/execution/run_uc3.sh
index 953718228..1e34aea99 100755
--- a/execution/run_uc3.sh
+++ b/execution/run_uc3.sh
@@ -91,25 +91,10 @@ echo "Finish topic deletion, print topics:"
echo "Delete ZooKeeper configurations used for workload generation"
kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
do
- IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
- found=0
- for element in "${array[@]}"
- do
- if [ "$element" == "workload-generation" ]; then
- found=1
- break
- fi
- done
- if [ $found -ne 1 ]; then
- echo "ZooKeeper reset was successful."
- break
- else
- echo "ZooKeeper reset was not successful. Retrying in 5s."
- sleep 5s
- fi
+ echo "Wait for ZooKeeper state deletion."
+ sleep 5s
done
echo "Deletion finished"
diff --git a/execution/run_uc4.sh b/execution/run_uc4.sh
index 91366a49d..bfd3ed8e2 100755
--- a/execution/run_uc4.sh
+++ b/execution/run_uc4.sh
@@ -90,25 +90,10 @@ echo "Finish topic deletion, print topics:"
echo "Delete ZooKeeper configurations used for workload generation"
kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 deleteall /workload-generation"
echo "Waiting for deletion"
-
-while [ true ]
+while kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 get /workload-generation"
do
- IFS=', ' read -r -a array <<< $(kubectl exec zookeeper-client -- bash -c "zookeeper-shell my-confluent-cp-zookeeper:2181 ls /" | tail -n 1 | awk -F[\]\[] '{print $2}')
- found=0
- for element in "${array[@]}"
- do
- if [ "$element" == "workload-generation" ]; then
- found=1
- break
- fi
- done
- if [ $found -ne 1 ]; then
- echo "ZooKeeper reset was successful."
- break
- else
- echo "ZooKeeper reset was not successful. Retrying in 5s."
- sleep 5s
- fi
+ echo "Wait for ZooKeeper state deletion."
+ sleep 5s
done
echo "Deletion finished"
--
GitLab