From a6fb88b6764100748cde8dcfc0937ae0297ecb90 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Sat, 20 Mar 2021 11:05:25 +0100 Subject: [PATCH 1/5] kokoro: hostcheck: Wait 30 seconds at the beginning The storage device needs a little bit of time to be attached. Wait at the beginning to make sure the storage device is really not mounted. Signed-off-by: Daniel Schultz --- .github/kokoro/steps/hostcheck.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/kokoro/steps/hostcheck.sh b/.github/kokoro/steps/hostcheck.sh index e2a83ff8..3ac44593 100755 --- a/.github/kokoro/steps/hostcheck.sh +++ b/.github/kokoro/steps/hostcheck.sh @@ -13,6 +13,8 @@ echo echo "========================================" echo "Check storage" echo "----------------------------------------" +# Wait 30 seconds to not check the storage too early. +sleep 30 set -x +e mount | grep /tmpfs MOUNT_RET=$? From 173bb3b34a22d96829633760971a2518e7d204a6 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Sat, 20 Mar 2021 11:11:05 +0100 Subject: [PATCH 2/5] kokoro: hostcheck: Add more debug information Signed-off-by: Daniel Schultz --- .github/kokoro/steps/hostcheck.sh | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/kokoro/steps/hostcheck.sh b/.github/kokoro/steps/hostcheck.sh index 3ac44593..27edc2ca 100755 --- a/.github/kokoro/steps/hostcheck.sh +++ b/.github/kokoro/steps/hostcheck.sh @@ -29,5 +29,41 @@ if [[ $MOUNT_RET != 0 ]] ; then echo "----------------------------------------" dmesg + echo "========================================" + echo "Partition information" + echo "----------------------------------------" + echo "" + echo "partprobe" + echo "----------------------------------------" + partprobe -s + echo "" + echo "cat /proc/partitions" + echo "----------------------------------------" + cat /proc/partitions + echo "" + echo "cat /etc/fstab" + echo "----------------------------------------" + cat /etc/fstab + echo "" + echo "cat /etc/mtab" + echo "----------------------------------------" + cat /etc/mtab + echo "" + echo "lsblk" + echo "----------------------------------------" + lsblk --list --output 'NAME,KNAME,FSTYPE,MOUNTPOINT,LABEL,UUID,PARTTYPE,PARTLABEL,PARTUUID' + echo "" + echo "sfdisk" + echo "----------------------------------------" + sudo sfdisk --list + echo "" + echo "systemctl | grep mount" + echo "----------------------------------------" + systemctl | grep mount + echo "" + echo "systemctl | grep dev" + echo "----------------------------------------" + systemctl | grep dev + exit $MOUNT_RET fi From e418f024b9f39383315f07c92053cbc73ee2a13d Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Wed, 24 Mar 2021 10:13:55 +0100 Subject: [PATCH 3/5] hostcheck: apply suggestion from comment and replaced tab with spaces Signed-off-by: Alessandro Comodi --- .github/kokoro/steps/hostcheck.sh | 121 +++++++++++++++++------------- 1 file changed, 69 insertions(+), 52 deletions(-) diff --git a/.github/kokoro/steps/hostcheck.sh b/.github/kokoro/steps/hostcheck.sh index 27edc2ca..ae916bab 100755 --- a/.github/kokoro/steps/hostcheck.sh +++ b/.github/kokoro/steps/hostcheck.sh @@ -11,59 +11,76 @@ set -e echo echo "========================================" -echo "Check storage" +echo "Waiting for storage" echo "----------------------------------------" -# Wait 30 seconds to not check the storage too early. -sleep 30 -set -x +e -mount | grep /tmpfs -MOUNT_RET=$? -set +x -e -if [[ $MOUNT_RET != 0 ]] ; then - echo "----------------------------------------" - echo "Error: No storage is mounted on /tmpfs." - echo "----------------------------------------" +STORAGE_CHECK_ATTEMPTS=1 +while true; do + # Check that tmpfs has been mounted correctly. + set -x +e + mount | grep /tmpfs + MOUNT_RET=$? + set +x -e + if [[ $MOUNT_RET == 0 ]] ; then + break; + else + echo "----------------------------------------" + echo "Error: No storage is mounted on /tmpfs." + echo "----------------------------------------" + echo "" + fi - echo "========================================" - echo "Dmesg dump" - echo "----------------------------------------" - dmesg + # Dump debugging information. + echo "========================================" + echo "Dmesg dump" + echo "----------------------------------------" + dmesg - echo "========================================" - echo "Partition information" - echo "----------------------------------------" - echo "" - echo "partprobe" - echo "----------------------------------------" - partprobe -s - echo "" - echo "cat /proc/partitions" - echo "----------------------------------------" - cat /proc/partitions - echo "" - echo "cat /etc/fstab" - echo "----------------------------------------" - cat /etc/fstab - echo "" - echo "cat /etc/mtab" - echo "----------------------------------------" - cat /etc/mtab - echo "" - echo "lsblk" - echo "----------------------------------------" - lsblk --list --output 'NAME,KNAME,FSTYPE,MOUNTPOINT,LABEL,UUID,PARTTYPE,PARTLABEL,PARTUUID' - echo "" - echo "sfdisk" - echo "----------------------------------------" - sudo sfdisk --list - echo "" - echo "systemctl | grep mount" - echo "----------------------------------------" - systemctl | grep mount - echo "" - echo "systemctl | grep dev" - echo "----------------------------------------" - systemctl | grep dev + echo "========================================" + echo "Partition information" + echo "----------------------------------------" + echo "" + echo "partprobe" + echo "----------------------------------------" + partprobe -s + echo "" + echo "cat /proc/partitions" + echo "----------------------------------------" + cat /proc/partitions + echo "" + echo "cat /etc/fstab" + echo "----------------------------------------" + cat /etc/fstab + echo "" + echo "cat /etc/mtab" + echo "----------------------------------------" + cat /etc/mtab + echo "" + echo "lsblk" + echo "----------------------------------------" + lsblk --list --output 'NAME,KNAME,FSTYPE,MOUNTPOINT,LABEL,UUID,PARTTYPE,PARTLABEL,PARTUUID' + echo "" + echo "sfdisk" + echo "----------------------------------------" + sudo sfdisk --list + echo "" + echo "systemctl | grep mount" + echo "----------------------------------------" + systemctl | grep mount + echo "" + echo "systemctl | grep dev" + echo "----------------------------------------" + systemctl | grep dev - exit $MOUNT_RET -fi + # Fail if we have waited to long. + if [[ $STORAGE_CHECK_ATTEMPTS -gt 5 ]]; then + exit $MOUNT_RET + else + STORAGE_CHECK_ATTEMPTS=$(( $STORAGE_CHECK_ATTEMPTS + 1 )) + fi + + # Wait for a bit before rechecking. + SLEEP_FOR=$(( STORAGE_CHECK_ATTEMPTS * 10 )) + echo "" + echo "Sleeping for $SLEEP_FOR seconds before trying again..." + sleep $SLEEP_FOR +done From 5ca05083d05b83daccf0d80d672c732f377f828f Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Thu, 25 Mar 2021 09:47:42 +0100 Subject: [PATCH 4/5] hostcheck: increase timeout and fix indentation Signed-off-by: Alessandro Comodi --- .github/kokoro/steps/hostcheck.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/kokoro/steps/hostcheck.sh b/.github/kokoro/steps/hostcheck.sh index ae916bab..8606f527 100755 --- a/.github/kokoro/steps/hostcheck.sh +++ b/.github/kokoro/steps/hostcheck.sh @@ -21,12 +21,12 @@ while true; do MOUNT_RET=$? set +x -e if [[ $MOUNT_RET == 0 ]] ; then - break; + break; else - echo "----------------------------------------" - echo "Error: No storage is mounted on /tmpfs." - echo "----------------------------------------" - echo "" + echo "----------------------------------------" + echo "Error: No storage is mounted on /tmpfs." + echo "----------------------------------------" + echo "" fi # Dump debugging information. @@ -72,10 +72,13 @@ while true; do systemctl | grep dev # Fail if we have waited to long. - if [[ $STORAGE_CHECK_ATTEMPTS -gt 5 ]]; then - exit $MOUNT_RET + if [[ $STORAGE_CHECK_ATTEMPTS -gt 10 ]]; then + echo "==============================" + echo " ERROR: Storage check timeout" + echo "==============================" + exit $MOUNT_RET else - STORAGE_CHECK_ATTEMPTS=$(( $STORAGE_CHECK_ATTEMPTS + 1 )) + STORAGE_CHECK_ATTEMPTS=$(( $STORAGE_CHECK_ATTEMPTS + 1 )) fi # Wait for a bit before rechecking. From 865859a5f6faaa7be59b079ec4baf6c0de27f1ad Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Thu, 25 Mar 2021 10:55:13 +0100 Subject: [PATCH 5/5] hostcheck: add mount to the output Signed-off-by: Alessandro Comodi --- .github/kokoro/steps/hostcheck.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/kokoro/steps/hostcheck.sh b/.github/kokoro/steps/hostcheck.sh index 8606f527..de374276 100755 --- a/.github/kokoro/steps/hostcheck.sh +++ b/.github/kokoro/steps/hostcheck.sh @@ -30,6 +30,11 @@ while true; do fi # Dump debugging information. + echo "========================================" + echo "Mount output" + echo "----------------------------------------" + mount + echo "========================================" echo "Dmesg dump" echo "----------------------------------------"