Merge remote-tracking branch 'upstream/master' into feature/runUcPython

execution/run_uc1.sh

@@ -111,25 +111,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"
 

execution/run_uc2.sh

@@ -116,25 +116,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"
 

execution/run_uc3.sh

@@ -112,25 +112,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"
 

execution/run_uc4.sh

@@ -111,25 +111,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"