From ced6605909a7364200fa9c3fcf0d695f6486c604 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Mar 2014 17:20:09 +0100
Subject: [vmchooser] More debug output if dnbd3 fails

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 2cd92776..f9b4aaf1 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -472,6 +472,7 @@ cp "$VMCHOOSER_DIR/data/openslx.exe" "$VMCHOOSER_DIR/fd-loop/"
 unset vm_diskfile
 unset vm_revision
 unset dnbd3
+unset dnbd3error
 if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "x$SLX_VM_DNBD3" = "xyes" ]; then
 	if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then
 		# Shuffle server list
@@ -486,9 +487,11 @@ if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "x$SLX_VM_DN
 				vmpath="$vm_diskfile"
 				break
 			fi
+			dnbd3error="$dnbd3error ($RET/$dnbd3)"
+			usleep 200000
 		done
 		if [ -z "$vm_diskfile" ]; then
-			slxlog "virt-dnbd3" "No dnbd3 server for ${vmpath#/mnt/vmstore/} found ($SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS), trying NFS..."
+			slxlog "virt-dnbd3" "No dnbd3 server for ${vmpath#/mnt/vmstore/} found ($SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS $dnbd3error), trying NFS..."
 			writelog "No working dnbd3 server found :-("
 		fi
 	else
-- 
cgit v1.2.3-55-g7522