twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-06-08 01:18:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Simplify healthcheck

Browse Source 
fix: Simplify healthcheck
This commit is contained in:
Kroese 2023-12-15 09:17:53 +01:00 committed by GitHub
commit b6502e0a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/check.sh
View File

@ -1,56 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -Eeuo pipefail set -Eeuo pipefail
[ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
[ -f "/run/qemu.count" ] && echo "QEMU is shutting down.." && exit 1
file="/run/dsm.url" file="/run/dsm.url"
active="/run/qemu.pid" [ ! -f "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
shutdown="/run/qemu.count"
url="http://127.0.0.1:2210/read?command=10"
active_msg="QEMU not running yet.."
shutdown_msg="QEMU is shutting down.."
resp_err="Guest returned an invalid response:"
jq_err="Failed to parse response from guest: jq error"
[ ! -f "$active" ] && echo "$active_msg" && exit 0
[ -f "$shutdown" ] && echo "$shutdown_msg" && exit 1
if [ ! -f "$file" ]; then
# Retrieve IP from guest VM for Docker healthcheck
{ json=$(curl -m 20 -sk "$url"); rc=$?; } || :
[ -f "$shutdown" ] && echo "$shutdown_msg" && exit 1
(( rc != 0 )) && echo "Failed to connect to guest: curl error $rc" && exit 1
{ result=$(echo "$json" | jq -r '.status'); rc=$?; } || :
(( rc != 0 )) && echo "$jq_err $rc ( $json )" && exit 1
[[ "$result" == "null" ]] && echo "$resp_err $json" && exit 1
if [[ "$result" != "success" ]] ; then
{ msg=$(echo "$json" | jq -r '.message'); rc=$?; } || :
echo "Guest replied $result: $msg" && exit 1
fi
{ port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || :
(( rc != 0 )) && echo "$jq_err $rc ( $json )" && exit 1
[[ "$port" == "null" ]] && echo "$resp_err $json" && exit 1
[ -z "$port" ] && echo "Guest has not set a portnumber yet.." && exit 1
{ ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || :
(( rc != 0 )) && echo "$jq_err $rc ( $json )" && exit 1
[[ "$ip" == "null" ]] && echo "$resp_err $json" && exit 1
[ -z "$ip" ] && echo "Guest has not received an IP yet.." && exit 1
echo "$ip:$port" > $file
fi
[ -f "$shutdown" ] && echo "$shutdown_msg" && exit 1
location=$(cat "$file") location=$(cat "$file")
if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
[ -f "$shutdown" ] && echo "$shutdown_msg" && exit 1
echo "Failed to reach page at http://$location" && exit 1 echo "Failed to reach page at http://$location" && exit 1
fi fi

5
src/install.sh
View File

@ -141,12 +141,13 @@ if [ -f "$RDC" ]; then
if [[ "$DEV" == [Nn]* ]]; then if [[ "$DEV" == [Nn]* ]]; then
# Exclude dev/ from cpio extract # Exclude dev/ from cpio extract
{ (cd "$TMP" && cpio -it < "$TMP/rd" | grep -Ev 'dev/' | while read -r entry; do cpio -idm "$entry" < "$TMP/rd" 2>/dev/null; done); rc=$?; } || : { (cd "$TMP" && cpio -it < "$TMP/rd" | grep -Ev 'dev/' | while read -r entry; do cpio -idm "$entry" < "$TMP/rd" 2>/dev/null; done); rc=$?; } || :
(( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
else else
{ (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || : { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
(( rc != 0 )) && error "Failed to extract $RDC, reason $rc"
(( rc != 0 )) && error "If the container runs unprivileged, please set DEV=N to exclude device nodes." && exit 92
fi fi
(( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
mkdir -p /run/extract mkdir -p /run/extract
for file in $TMP/usr/lib/libcurl.so.4 \ for file in $TMP/usr/lib/libcurl.so.4 \
$TMP/usr/lib/libmbedcrypto.so.5 \ $TMP/usr/lib/libmbedcrypto.so.5 \