From ea9dc0605bbc189351d7c31995a740c90b66f8d2 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 16 Jul 2024 09:11:18 +0200 Subject: [PATCH 1/2] HDDS-11186. First container log missing from bundle --- hadoop-ozone/dist/src/main/compose/testlib.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh index ff676dc2a566..a1a0248d8463 100755 --- a/hadoop-ozone/dist/src/main/compose/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/testlib.sh @@ -304,9 +304,10 @@ get_output_name() { save_container_logs() { local output_name=$(get_output_name) - local c - for c in $(docker-compose ps -a "$@" | cut -f1 -d' ' | tail -n +3); do - docker logs "${c}" >> "$RESULT_DIR/docker-${output_name}${c}.log" 2>&1 + local id + for id in $(docker-compose ps -a -q "$@"); do + local c=$(docker ps --filter "id=${id}" --format "{{ .Names }}") + docker logs "${id}" >> "$RESULT_DIR/docker-${output_name}${c}.log" 2>&1 done } From 3cf3058c8ba16416c8af68bb85b6aed526d12124 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 16 Jul 2024 11:31:52 +0200 Subject: [PATCH 2/2] ${id} is replaced by maven-resources-plugin --- hadoop-ozone/dist/src/main/compose/testlib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh index a1a0248d8463..44b4f303807f 100755 --- a/hadoop-ozone/dist/src/main/compose/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/testlib.sh @@ -305,9 +305,9 @@ get_output_name() { save_container_logs() { local output_name=$(get_output_name) local id - for id in $(docker-compose ps -a -q "$@"); do - local c=$(docker ps --filter "id=${id}" --format "{{ .Names }}") - docker logs "${id}" >> "$RESULT_DIR/docker-${output_name}${c}.log" 2>&1 + for i in $(docker-compose ps -a -q "$@"); do + local c=$(docker ps -a --filter "id=${i}" --format "{{ .Names }}") + docker logs "${i}" >> "$RESULT_DIR/docker-${output_name}${c}.log" 2>&1 done }