From bc25d189e0ad3af80ad7c9473e08445eaeaa5d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Wed, 2 Feb 2022 13:43:53 +0100
Subject: [PATCH] Enhance error handling

---
 theodolite-benchmarks/docker-test/smoketest-runner.sh    | 2 +-
 theodolite-benchmarks/docker-test/uc2-beam-flink/test.sh | 2 ++
 theodolite-benchmarks/docker-test/uc2-beam-samza/test.sh | 2 ++
 theodolite-benchmarks/docker-test/uc2-flink/test.sh      | 2 ++
 theodolite-benchmarks/docker-test/uc2-kstreams/test.sh   | 2 ++
 theodolite-benchmarks/docker-test/uc3-beam-flink/test.sh | 2 ++
 theodolite-benchmarks/docker-test/uc3-beam-samza/test.sh | 2 ++
 theodolite-benchmarks/docker-test/uc3-kstreams/test.sh   | 2 ++
 theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh | 2 ++
 theodolite-benchmarks/docker-test/uc4-beam-samza/test.sh | 2 ++
 theodolite-benchmarks/docker-test/uc4-flink/test.sh      | 2 ++
 theodolite-benchmarks/docker-test/uc4-kstreams/test.sh   | 2 ++
 12 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/theodolite-benchmarks/docker-test/smoketest-runner.sh b/theodolite-benchmarks/docker-test/smoketest-runner.sh
index b7f0c2539..e464421ad 100755
--- a/theodolite-benchmarks/docker-test/smoketest-runner.sh
+++ b/theodolite-benchmarks/docker-test/smoketest-runner.sh
@@ -12,7 +12,7 @@ sleep 5s
 docker-compose ps
 
 if test -f "./test.sh"; then
-    ./test.sh
+    timeout 3m ./test.sh
     RETURN=$?
 else
     RETURN=$?
diff --git a/theodolite-benchmarks/docker-test/uc2-beam-flink/test.sh b/theodolite-benchmarks/docker-test/uc2-beam-flink/test.sh
index 047ea6cc9..3c33834b0 100755
--- a/theodolite-benchmarks/docker-test/uc2-beam-flink/test.sh
+++ b/theodolite-benchmarks/docker-test/uc2-beam-flink/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 20 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc2-beam-samza/test.sh b/theodolite-benchmarks/docker-test/uc2-beam-samza/test.sh
index 047ea6cc9..3c33834b0 100755
--- a/theodolite-benchmarks/docker-test/uc2-beam-samza/test.sh
+++ b/theodolite-benchmarks/docker-test/uc2-beam-samza/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 20 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc2-flink/test.sh b/theodolite-benchmarks/docker-test/uc2-flink/test.sh
index 047ea6cc9..3c33834b0 100755
--- a/theodolite-benchmarks/docker-test/uc2-flink/test.sh
+++ b/theodolite-benchmarks/docker-test/uc2-flink/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 20 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc2-kstreams/test.sh b/theodolite-benchmarks/docker-test/uc2-kstreams/test.sh
index 047ea6cc9..3c33834b0 100755
--- a/theodolite-benchmarks/docker-test/uc2-kstreams/test.sh
+++ b/theodolite-benchmarks/docker-test/uc2-kstreams/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 20 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc3-beam-flink/test.sh b/theodolite-benchmarks/docker-test/uc3-beam-flink/test.sh
index bc4548416..0612838a3 100755
--- a/theodolite-benchmarks/docker-test/uc3-beam-flink/test.sh
+++ b/theodolite-benchmarks/docker-test/uc3-beam-flink/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 600 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc3-beam-samza/test.sh b/theodolite-benchmarks/docker-test/uc3-beam-samza/test.sh
index bc4548416..0612838a3 100755
--- a/theodolite-benchmarks/docker-test/uc3-beam-samza/test.sh
+++ b/theodolite-benchmarks/docker-test/uc3-beam-samza/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 600 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc3-kstreams/test.sh b/theodolite-benchmarks/docker-test/uc3-kstreams/test.sh
index bc4548416..0612838a3 100755
--- a/theodolite-benchmarks/docker-test/uc3-kstreams/test.sh
+++ b/theodolite-benchmarks/docker-test/uc3-kstreams/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=s -r http://schema-registry:8081 -f '%k:%s\n' -c 600 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh b/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh
index f6a7eccb7..6a4c6dbf4 100755
--- a/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh
+++ b/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=avro -r http://schema-registry:8081 -f '%k:%s\n' -c 2000 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc4-beam-samza/test.sh b/theodolite-benchmarks/docker-test/uc4-beam-samza/test.sh
index f6a7eccb7..6a4c6dbf4 100755
--- a/theodolite-benchmarks/docker-test/uc4-beam-samza/test.sh
+++ b/theodolite-benchmarks/docker-test/uc4-beam-samza/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=avro -r http://schema-registry:8081 -f '%k:%s\n' -c 2000 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc4-flink/test.sh b/theodolite-benchmarks/docker-test/uc4-flink/test.sh
index 71fd0fbeb..0a478cf66 100755
--- a/theodolite-benchmarks/docker-test/uc4-flink/test.sh
+++ b/theodolite-benchmarks/docker-test/uc4-flink/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=avro -r http://schema-registry:8081 -f '%k:%s\n' -c 500 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
diff --git a/theodolite-benchmarks/docker-test/uc4-kstreams/test.sh b/theodolite-benchmarks/docker-test/uc4-kstreams/test.sh
index 75f020a63..9b9dee7dc 100755
--- a/theodolite-benchmarks/docker-test/uc4-kstreams/test.sh
+++ b/theodolite-benchmarks/docker-test/uc4-kstreams/test.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
+
 docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=avro -r http://schema-registry:8081 -f '%k:%s\n' -c 32 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
-- 
GitLab