diff --git a/execution/run_uc1.sh b/execution/run_uc1.sh index 04eb86edc9bb5653f3281793bf48655bca643391..7dc0e4e97a801b1a974110c81bb37daef44d3f0b 100755 --- a/execution/run_uc1.sh +++ b/execution/run_uc1.sh @@ -76,7 +76,7 @@ echo "Finished execution, print topics:" #kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(titan-.*|input|output|configuration)( - marked for deletion)?$/p' while test $(kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(theodolite-.*|input|output|configuration)( - marked for deletion)?$/p' | wc -l) -gt 0 do - kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|output|configuration|theodolite-.*'" + kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|output|configuration|theodolite-.*' --if-exists" echo "Wait for topic deletion" sleep 5s #echo "Finished waiting, print topics:" diff --git a/execution/run_uc2.sh b/execution/run_uc2.sh index a2a43a806ab8cc796f45d9c88f4cbf87049b0c3f..c294e735bf5d991af51fb914fa9211bb6bdc9a2e 100755 --- a/execution/run_uc2.sh +++ b/execution/run_uc2.sh @@ -75,7 +75,7 @@ echo "Finished execution, print topics:" #kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(titan-.*|input|output|configuration)( - marked for deletion)?$/p' while test $(kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(theodolite-.*|input|aggregation-feedback|output|configuration)( - marked for deletion)?$/p' | wc -l) -gt 0 do - kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|aggregation-feedback|output|configuration|theodolite-.*'" + kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|aggregation-feedback|output|configuration|theodolite-.*' --if-exists" echo "Wait for topic deletion" sleep 5s #echo "Finished waiting, print topics:" diff --git a/execution/run_uc3.sh b/execution/run_uc3.sh index f214e20b3af93b0f89d76d6ea50ce3d7cd428ded..9537182280379a80877420b0864baaa77d382fea 100755 --- a/execution/run_uc3.sh +++ b/execution/run_uc3.sh @@ -77,7 +77,7 @@ echo "Finished execution, print topics:" #kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(titan-.*|input|output|configuration)( - marked for deletion)?$/p' while test $(kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(theodolite-.*|input|output|configuration)( - marked for deletion)?$/p' | wc -l) -gt 0 do - kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|output|configuration|theodolite-.*'" + kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|output|configuration|theodolite-.*' --if-exists" echo "Wait for topic deletion" sleep 5s #echo "Finished waiting, print topics:" diff --git a/execution/run_uc4.sh b/execution/run_uc4.sh index 04fd130694e96285ca93b7561f1ea58ccdb30ab8..91366a49d252edbe872cda1e1726054ec5df4b61 100755 --- a/execution/run_uc4.sh +++ b/execution/run_uc4.sh @@ -76,7 +76,7 @@ echo "Finished execution, print topics:" #kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(titan-.*|input|output|configuration)( - marked for deletion)?$/p' while test $(kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --list" | sed -n -E '/^(theodolite-.*|input|output|configuration)( - marked for deletion)?$/p' | wc -l) -gt 0 do - kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|output|configuration|theodolite-.*'" + kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input|output|configuration|theodolite-.*' --if-exists" echo "Wait for topic deletion" sleep 5s #echo "Finished waiting, print topics:"