Merge pull request #488 from bergwolf/startpod

Startpod failure

Author: laijs

hypervisor/hypervisor.go

@@ -44,7 +44,7 @@ func (ctx *VmContext) handlePAEs() {
 }
 
 func (ctx *VmContext) watchHyperstart(sendReadyEvent bool) {
-	timeout := time.AfterFunc(30*time.Second, func() {
+	timeout := time.AfterFunc(60*time.Second, func() {
 		if ctx.PauseState == PauseStateUnpaused {
 			ctx.Log(ERROR, "watch hyperstart timeout")
 			ctx.Hub <- &InitFailedEvent{Reason: "watch hyperstart timeout"}
@@ -69,7 +69,7 @@ func (ctx *VmContext) watchHyperstart(sendReadyEvent bool) {
 			sendReadyEvent = false
 		}
 		time.Sleep(10 * time.Second)
-		timeout.Reset(30 * time.Second)
+		timeout.Reset(60 * time.Second)
 	}
 	timeout.Stop()
 }

hypervisor/vm.go

@@ -226,9 +226,9 @@ func (vm *Vm) WaitProcess(isContainer bool, ids []string, timeout int) <-chan *a
 	return result
 }
 
-func (vm *Vm) InitSandbox(config *api.SandboxConfig) {
+func (vm *Vm) InitSandbox(config *api.SandboxConfig) error {
 	vm.ctx.SetNetworkEnvironment(config)
-	vm.ctx.startPod()
+	return vm.ctx.startPod()
 }
 
 func (vm *Vm) WaitInit() api.Result {

hypervisor/vm_states.go

@@ -181,16 +181,17 @@ func streamCopy(tty *TtyIO, stdinPipe io.WriteCloser, stdoutPipe, stderrPipe io.
 	once.Do(cleanup)
 }
 
-func (ctx *VmContext) startPod() {
+func (ctx *VmContext) startPod() error {
 	err := ctx.hyperstart.StartSandbox(ctx.networks.sandboxInfo())
 	if err == nil {
 		ctx.Log(INFO, "pod start successfully")
 		ctx.reportSuccess("Start POD success", []byte{})
 	} else {
-		reason := "Start POD failed"
+		reason := fmt.Sprintf("Start POD failed: %s", err.Error())
 		ctx.reportVmFault(reason)
 		ctx.Log(ERROR, reason)
 	}
+	return err
 }
 
 func (ctx *VmContext) shutdownVM() {