From 330336fd73238f40a245d7bf8c2156583656b09d Mon Sep 17 00:00:00 2001 From: Maycon Amaro Date: Wed, 24 Jul 2024 15:28:14 -0300 Subject: [PATCH 1/2] e2e(generic): do not traverse directories from other filesystems --- chaos/experiments/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chaos/experiments/main.sh b/chaos/experiments/main.sh index 59d229c3b..dfb4359a1 100755 --- a/chaos/experiments/main.sh +++ b/chaos/experiments/main.sh @@ -61,10 +61,10 @@ cleanup() { sleep 2 if [ $exit_code -eq 0 ]; then rm instance_*.log 2>/dev/null || true - find . -type d -name "instance_*" -print0 | xargs -0 rm -rf 2>/dev/null || true + find . -xdev -type d -name "instance_*" -print0 | xargs -0 rm -rf 2>/dev/null || true fi rm -rf tmp_rocks_* 2>/dev/null || true - find . -type d -name "tmp_rocks_*" -print0 | xargs -0 rm -rf 2>/dev/null || true + find . -xdev -type d -name "tmp_rocks_*" -print0 | xargs -0 rm -rf 2>/dev/null || true echo "Job is done. With exit code $exit_code" } trap cleanup EXIT INT TERM From 46b49f478d0e37ff778c20a0d678e08bae3ef678 Mon Sep 17 00:00:00 2001 From: Maycon Amaro Date: Wed, 24 Jul 2024 15:33:43 -0300 Subject: [PATCH 2/2] do not block on killport --- chaos/experiments/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaos/experiments/main.sh b/chaos/experiments/main.sh index dfb4359a1..b108b6ac1 100755 --- a/chaos/experiments/main.sh +++ b/chaos/experiments/main.sh @@ -264,7 +264,7 @@ run_test() { echo "Killing the leader instance on address $leader_port..." for i in "${!leader_ports[@]}"; do if [ "${leader_ports[i]}" == "$leader_port" ]; then - killport --quiet $leader_port + killport --quiet $leader_port || true break fi done