Merge pull request #993 from markdryan/fix-956

ciao-down: Update connect and status to handle booting VMs

testutil/ciao-down/ciao_down.go

@@ -30,6 +30,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"syscall"
+	"time"
 )
 
 func init() {
@@ -257,6 +258,36 @@ func connect(ctx context.Context, errCh chan error) {
 		return
 	}
 
+	if !vmStarted(ctx, ws.instanceDir) {
+		errCh <- fmt.Errorf("VM is not running.  Try ciao-down start")
+		return
+	}
+
+	if !sshReady(ctx) {
+		fmt.Printf("Waiting for VM to boot ")
+	DONE:
+		for {
+			select {
+			case <-time.After(time.Second):
+			case <-ctx.Done():
+				errCh <- fmt.Errorf("Cancelled")
+				return
+			}
+
+			if !vmStarted(ctx, ws.instanceDir) {
+				errCh <- fmt.Errorf("VM is not running.  Try ciao-down start")
+				return
+			}
+
+			if sshReady(ctx) {
+				break DONE
+			}
+
+			fmt.Print(".")
+		}
+		fmt.Println()
+	}
+
 	err = syscall.Exec(path, []string{path,
 		"-q", "-o", "UserKnownHostsFile=/dev/null",
 		"-o", "StrictHostKeyChecking=no",

testutil/ciao-down/vm.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"bufio"
 	"bytes"
 	"context"
 	"fmt"
@@ -99,16 +100,40 @@ func quitVM(ctx context.Context, instanceDir string) error {
 	})
 }
 
-func statusVM(ctx context.Context, instanceDir, keyPath string) {
-	status := "ciao down"
-	ssh := "N/A"
+func sshReady(ctx context.Context) bool {
+	dialer := net.Dialer{}
+	conn, err := dialer.DialContext(ctx, "tcp", "127.0.0.1:10022")
+	if err != nil {
+		return false
+	}
+	_ = conn.SetReadDeadline(time.Now().Add(time.Millisecond * 500))
+	scanner := bufio.NewScanner(conn)
+	retval := scanner.Scan()
+	_ = conn.Close()
+	return retval
+}
+
+func vmStarted(ctx context.Context, instanceDir string) bool {
 	socket := path.Join(instanceDir, "socket")
 	disconnectedCh := make(chan struct{})
 	qmp, _, err := qemu.QMPStart(ctx, socket, qemu.QMPConfig{}, disconnectedCh)
-	if err == nil {
-		status = "ciao up"
-		ssh = fmt.Sprintf("ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s 127.0.0.1 -p %d", keyPath, 10022)
-		defer qmp.Shutdown()
+	if err != nil {
+		return false
+	}
+	qmp.Shutdown()
+	return true
+}
+
+func statusVM(ctx context.Context, instanceDir, keyPath string) {
+	status := "ciao down"
+	ssh := "N/A"
+	if vmStarted(ctx, instanceDir) {
+		if sshReady(ctx) {
+			status = "ciao up"
+			ssh = fmt.Sprintf("ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s 127.0.0.1 -p %d", keyPath, 10022)
+		} else {
+			status = "ciao up (booting)"
+		}
 	}
 
 	w := new(tabwriter.Writer)