diff options
| author | Simon Rettberg | 2019-10-28 12:33:20 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-10-28 12:33:20 +0100 |
| commit | 115858b81b8c21514fb26fb24a55d50a0e941e2a (patch) | |
| tree | 1c98618c79b38105b071e94e5e3f7d0649f6a2d4 /core/modules/run-virt/data/opt/openslx/vmchooser | |
| parent | [run-virt] Clean up run-vort-inv script a little (diff) | |
| download | mltk-115858b81b8c21514fb26fb24a55d50a0e941e2a.tar.gz mltk-115858b81b8c21514fb26fb24a55d50a0e941e2a.tar.xz mltk-115858b81b8c21514fb26fb24a55d50a0e941e2a.zip | |
[run-virt] Retry mounting image via dnbd3 for up to 4 seconds
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc index fad51c5d..73a01800 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc @@ -39,8 +39,11 @@ setup_dnbd3 () { local TIMEOUT VM_DISKFILE_REVISION rm -f -- "${DNBD3_EXITFLAG}" ( - dnbd3-fuse -f -o allow_other,max_readahead=262144 -h "${SLX_DNBD3_SERVERS}" -i "${SRC_IMG_RELATIVE}" "${DNBD3_MOUNT_POINT}" > "${DNBD3_TMPLOG}" 2>&1 - RET=$? + startup="$( date +%s )" + while [ "$( date +%s )" -lt "$(( startup + 4 ))" ]; do + dnbd3-fuse -f -o allow_other,max_readahead=262144 -h "${SLX_DNBD3_SERVERS}" -i "${SRC_IMG_RELATIVE}" "${DNBD3_MOUNT_POINT}" > "${DNBD3_TMPLOG}" 2>&1 + RET=$? + done touch "${DNBD3_EXITFLAG}" if [ "$RET" != "0" ]; then writelog "dnbd3-fuse stopped working (Exit code $RET)" @@ -58,7 +61,7 @@ setup_dnbd3 () { add_cleanup "cleanup_dnbd3" break fi - [ "$TIMEOUT" = "OUT" -o -e "$DNBD3_EXITFLAG" ] && break + [ "$TIMEOUT" = "OUT" ] || [ -e "$DNBD3_EXITFLAG" ] && break sleep "$TIMEOUT" done |