From 0fe396d5c14fcf25863aaff828e2fbb2721a70fc Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunionyun.com>
Date: Thu, 14 May 2020 12:07:21 +0800
Subject: [PATCH 1/2] remove statefile in start script

---
 pkg/hostman/guestman/qemu-kvmhelper.go | 50 +++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go
index 62d5fb8cf4..3e3a27d858 100644
--- a/pkg/hostman/guestman/qemu-kvmhelper.go
+++ b/pkg/hostman/guestman/qemu-kvmhelper.go
@@ -366,7 +366,7 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri
 		cmd += d.GetDiskSetupScripts(int(diskIndex))
 	}
 
-	cmd += fmt.Sprintf("STATE_FILE=`ls -d %s* | head -n 1`\n", s.getStateFilePathRootPrefix())
+	// cmd += fmt.Sprintf("STATE_FILE=`ls -d %s* | head -n 1`\n", s.getStateFilePathRootPrefix())
 	cmd += fmt.Sprintf("PID_FILE=%s\n", s.GetPidFilePath())
 
 	var qemuCmd = qemutils.GetQemu(qemuVersion)
@@ -375,23 +375,23 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri
 	}
 
 	cmd += fmt.Sprintf("DEFAULT_QEMU_CMD='%s'\n", qemuCmd)
-	cmd += "if [ -n \"$STATE_FILE\" ]; then\n"
-	cmd += "    QEMU_VER=`echo $STATE_FILE" +
-		` | grep -o '_[[:digit:]]\+\.[[:digit:]]\+.*'` + "`\n"
-	cmd += "    QEMU_CMD=\"qemu-system-x86_64\"\n"
-	cmd += "    QEMU_LOCAL_PATH=\"/usr/local/bin/$QEMU_CMD\"\n"
-	cmd += "    QEMU_LOCAL_PATH_VER=\"/usr/local/qemu-$QEMU_VER/bin/$QEMU_CMD\"\n"
-	cmd += "    QEMU_BIN_PATH=\"/usr/bin/$QEMU_CMD\"\n"
-	cmd += "    if [ -f \"$QEMU_LOCAL_PATH_VER\" ]; then\n"
-	cmd += "        QEMU_CMD=$QEMU_LOCAL_PATH_VER\n"
-	cmd += "    elif [ -f \"$QEMU_LOCAL_PATH\" ]; then\n"
-	cmd += "        QEMU_CMD=$QEMU_LOCAL_PATH\n"
-	cmd += "    elif [ -f \"$QEMU_BIN_PATH\" ]; then\n"
-	cmd += "        QEMU_CMD=$QEMU_BIN_PATH\n"
-	cmd += "    fi\n"
-	cmd += "else\n"
-	cmd += "    QEMU_CMD=$DEFAULT_QEMU_CMD\n"
-	cmd += "fi\n"
+	// cmd += "if [ -n \"$STATE_FILE\" ]; then\n"
+	// cmd += "    QEMU_VER=`echo $STATE_FILE" +
+	// 	` | grep -o '_[[:digit:]]\+\.[[:digit:]]\+.*'` + "`\n"
+	// cmd += "    QEMU_CMD=\"qemu-system-x86_64\"\n"
+	// cmd += "    QEMU_LOCAL_PATH=\"/usr/local/bin/$QEMU_CMD\"\n"
+	// cmd += "    QEMU_LOCAL_PATH_VER=\"/usr/local/qemu-$QEMU_VER/bin/$QEMU_CMD\"\n"
+	// cmd += "    QEMU_BIN_PATH=\"/usr/bin/$QEMU_CMD\"\n"
+	// cmd += "    if [ -f \"$QEMU_LOCAL_PATH_VER\" ]; then\n"
+	// cmd += "        QEMU_CMD=$QEMU_LOCAL_PATH_VER\n"
+	// cmd += "    elif [ -f \"$QEMU_LOCAL_PATH\" ]; then\n"
+	// cmd += "        QEMU_CMD=$QEMU_LOCAL_PATH\n"
+	// cmd += "    elif [ -f \"$QEMU_BIN_PATH\" ]; then\n"
+	// cmd += "        QEMU_CMD=$QEMU_BIN_PATH\n"
+	// cmd += "    fi\n"
+	// cmd += "else\n"
+	cmd += "QEMU_CMD=$DEFAULT_QEMU_CMD\n"
+	// cmd += "fi\n"
 	cmd += "function nic_speed() {\n"
 	cmd += "    $QEMU_CMD "
 
@@ -635,13 +635,13 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri
 	}
 
 	cmd += "\"\n"
-	cmd += "if [ ! -z \"$STATE_FILE\" ] && [ -d \"$STATE_FILE\" ] && [ -f \"$STATE_FILE/content\" ]; then\n"
-	cmd += "    $CMD --incoming \"exec: cat $STATE_FILE/content\"\n"
-	cmd += "elif [ ! -z \"$STATE_FILE\" ] && [ -f $STATE_FILE ]; then\n"
-	cmd += "    $CMD --incoming \"exec: cat $STATE_FILE\"\n"
-	cmd += "else\n"
-	cmd += "    $CMD\n"
-	cmd += "fi\n"
+	// cmd += "if [ ! -z \"$STATE_FILE\" ] && [ -d \"$STATE_FILE\" ] && [ -f \"$STATE_FILE/content\" ]; then\n"
+	// cmd += "    $CMD --incoming \"exec: cat $STATE_FILE/content\"\n"
+	// cmd += "elif [ ! -z \"$STATE_FILE\" ] && [ -f $STATE_FILE ]; then\n"
+	// cmd += "    $CMD --incoming \"exec: cat $STATE_FILE\"\n"
+	// cmd += "else\n"
+	cmd += "$CMD\n"
+	// cmd += "fi\n"
 
 	return cmd, nil
 }

From a5d2651fbf7df53235e555e301f5f0a936fb7361 Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunionyun.com>
Date: Thu, 14 May 2020 12:27:41 +0800
Subject: [PATCH 2/2] fix esxi disk disconnect

---
 pkg/hostman/hostdeployer/deployserver/deployserver.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/hostman/hostdeployer/deployserver/deployserver.go b/pkg/hostman/hostdeployer/deployserver/deployserver.go
index 66c85009b7..e0c2558844 100644
--- a/pkg/hostman/hostdeployer/deployserver/deployserver.go
+++ b/pkg/hostman/hostdeployer/deployserver/deployserver.go
@@ -246,7 +246,8 @@ func (*DeployerServer) DisconnectEsxiDisks(
 				delete(connectedEsxiDisks, req.Disks[i].DiskPath)
 			}
 		} else {
-			return new(deployapi.Empty), fmt.Errorf("disk %s not connected", req.Disks[i].DiskPath)
+			log.Warningf("esxi disk %s not connected", req.Disks[i].DiskPath)
+			continue
 		}
 	}
 	return new(deployapi.Empty), nil