From f8e41b1195de46fa10f7d81c5409e7d59a3ca360 Mon Sep 17 00:00:00 2001 From: aegor Date: Thu, 5 Nov 2026 16:54:10 +0300 Subject: [PATCH] fix: hide s3 key in bootstrap output and fail over both replicas in evidence --- compose.yaml | 2 +- scripts/collect-evidence.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index fd860aa..c9ef9b1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -110,7 +110,7 @@ services: POLICY mc admin policy create root messenger-api /tmp/policy.json mc admin user add root "$$(cat s3_access_key_id)" "$$(cat s3_secret_access_key)" > /dev/null - mc admin policy attach root messenger-api --user "$$(cat s3_access_key_id)" + mc admin policy attach root messenger-api --user "$$(cat s3_access_key_id)" > /dev/null echo "bucket $$S3_BUCKET ready" environment: S3_BUCKET: ${S3_BUCKET:-messenger-attachments} diff --git a/scripts/collect-evidence.sh b/scripts/collect-evidence.sh index 0347f21..d0b7c91 100755 --- a/scripts/collect-evidence.sh +++ b/scripts/collect-evidence.sh @@ -88,7 +88,8 @@ echo 'persistence.txt' echo 'failover.txt' { header 'make test-failover: stop-one.sh останавливает реплику, обслужившую тест; затем вторую' - for round in 1 2; do + first_stopped='' + for round in 1 2 3 4 5; do echo "## Прогон $round" echo '### до' api_states @@ -101,7 +102,14 @@ echo 'failover.txt' echo '### журнал HAProxy' docker compose logs --no-log-prefix --since "$since" lb 2>&1 | grep -E 'is DOWN|is UP|maintenance|READY' | grep -v '^\[WARNING\]' echo + stopped=$(docker compose ps -aq --status exited api | cut -c1-12) + echo "остановлена реплика: $stopped" + echo restore_api + if [ -n "$first_stopped" ] && [ "$stopped" != "$first_stopped" ]; then + break + fi + [ -n "$first_stopped" ] || first_stopped=$stopped python3 scripts/probe.py status GET /health/live >/dev/null done echo '## Проверка guard: stop-one.sh отказывается останавливать не api'