From b45db96450c314d9842e160225b49190d509a1a8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 29 Sep 2015 18:37:20 +0200
Subject: [MountVmStore] Timeout quicker, return exit code in status

---
 scripts/mount-store                                           | 2 +-
 src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/mount-store b/scripts/mount-store
index cb6b769..e0ce839 100755
--- a/scripts/mount-store
+++ b/scripts/mount-store
@@ -117,7 +117,7 @@ if grep -E -q '^[^/].+:.+' <<<$SOURCE; then
 	# seems to be NFS
 	for opt in vers=4 vers=3; do
 		echo " * Trying ${opt}..."
-		mount -v -t nfs -o rw,noatime,noexec,nodev,async,nolock,$opt,fg,ac,retry=1,timeo=150,sec=sys "$SOURCE" "$DEST"
+		mount -v -t nfs -o rw,noatime,noexec,nodev,async,nolock,$opt,fg,ac,retry=0,timeo=200,sec=sys "$SOURCE" "$DEST"
 		RET=$?
 		[ "$RET" -ne "0" ] && continue
 		echo "Mount succeeded, checking write permissions...."
diff --git a/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java b/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java
index 5d075d6..ba6e4b1 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java
@@ -63,6 +63,7 @@ public class MountVmStore extends SystemCommandTask
 		isRunning.set( false );
 		if ( exitCode != 0 )
 			status.addMessage( "Failed with exit code " + exitCode );
+		status.exitCode = exitCode;
 		return exitCode == 0;
 	}
 
@@ -80,7 +81,8 @@ public class MountVmStore extends SystemCommandTask
 
 	class Output
 	{
-		private String messages = null;
+		public String messages = null;
+		public int exitCode = -111;
 
 		private void addMessage( String str )
 		{
-- 
cgit v1.2.3-55-g7522