diff options
| author | Simon Rettberg | 2017-05-11 15:00:32 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-05-11 15:00:32 +0200 |
| commit | 7eae3054533f1d58f9767b1a2dd56eb038476eaa (patch) | |
| tree | 022875b92afb4ca08d3ff49f7a09f244e10f848f /core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/mltk (diff) | |
| download | mltk-7eae3054533f1d58f9767b1a2dd56eb038476eaa.tar.gz mltk-7eae3054533f1d58f9767b1a2dd56eb038476eaa.tar.xz mltk-7eae3054533f1d58f9767b1a2dd56eb038476eaa.zip | |
[run-virt] Improve wget error messages
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes')
2 files changed, 15 insertions, 8 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc index 114303b7..807c2840 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc @@ -20,11 +20,13 @@ download_metadata() { writelog "Detecting current/legacy mode..." declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp" - local WLOG="$TMPDIR/wget.log" local TRIES=0 + local EXTRA_ERROR= + local WLOG= while [ "$TRIES" -lt 3 ]; do TRIES=$(( TRIES + 1 )) writelog "wget try $TRIES" + WLOG="$TMPDIR/wget-${TRIES}.log" if wget -T 6 -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" &>"$WLOG"; then rm -f -- "$WLOG" writelog "Downloaded VM description from '${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}' successfully." @@ -33,8 +35,15 @@ download_metadata() { return 0 else writelog "Server sent zero byte virtual machine description file." + EXTRA_ERROR="(Der Server hat eine leere Antwort gesendet)" fi else + local ERRCODE=$(grep -m1 -o -E '\b[0-9]{3}\b' "$WLOG") + if [ -n "$ERRCODE" ]; then + EXTRA_ERROR="(HTTP Error Code $ERRCODE)" + else + EXTRA_ERROR="(Der Server ist nicht erreichbar)" + fi writelog "wget failed." slxlog --delete "run-virt-wget" "Downloading VMX failed" "$WLOG" fi @@ -42,13 +51,10 @@ download_metadata() { # Seems we are in legacy mode, which is no longer supported. Warn user and exit EXIT_TYPE="user" EXIT_REASON="msg.vm.no-metadata -Die gewählte VM ist eine 'Legacy VM', für die unvollständige -Metadaten auf dem bwLehrpool-Server hinterlegt sind. Diese -werden nicht mehr unterstützt. Um diese VM weiterhin nutzen -zu können, muss sie mittels der bwLehrpool-Suite heruntergeladen, -einmal gebootet, und wieder hochgeladen werden. -(Bei der Gelegenheit könnten z.B. auch gleich anfallende Updates -eingespielt werden.) +Die Metadaten der Lehrumgebung konnten nicht vom bwLehrpool-Satelliten +heruntergeladen werden. Bitte versuchen Sie es in wenigen Minuten erneut +und wenden Sie sich an den Support, wenn das Problem bestehen bleibt. +$EXTRA_ERROR " cleanexit 1 } 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 9ce0157e..9db578c1 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 @@ -33,6 +33,7 @@ setup_dnbd3 () { # Mount path for images mounted with dnbd3-fuse declare -rg DNBD3_MOUNT_POINT="${TMPDIR}/dnbd3fuse.mnt" mkdir -p "${DNBD3_MOUNT_POINT}" + mkdir -p "${DNBD3_MOUNT_POINT}" # start dnbd3-fuse in subshell local DNBD3_TMPLOG="${TMPDIR}/dnbd3fuse.log" local DNBD3_EXITFLAG="${TMPDIR}/dnbd3exit$RANDOM" |