From bc8f7b3b430d4c0d89ac02b65ad69a474b01d791 Mon Sep 17 00:00:00 2001
From: Shane Smith <shane.smith@shopify.com>
Date: Tue, 7 Jun 2022 12:57:54 -0400
Subject: Introduce 'Starting' status for machines

- The State() function now returns machine.Starting status instead of an
  empty string if the VM is in the process of starting.

- The `CheckExclusiveActiveVM()` function returns `true` to prevent
  starting a VM while another is in the process of starting.

- `podman machine ls` displays "Currently starting" under "Last Up" for
  the starting VM

- `podman machine ls` supports `{{.Starting}}` boolean field in the format

- `podman machine inspect` displays "starting" in the "State" field for
  the starting VM

Signed-off-by: Shane Smith <shane.smith@shopify.com>
---
 pkg/machine/config.go       | 7 +++++--
 pkg/machine/qemu/machine.go | 9 ++++++---
 pkg/machine/wsl/machine.go  | 1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'pkg')

diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index d34776714..5191f6100 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -42,7 +42,9 @@ const (
 	// Running indicates the qemu vm is running.
 	Running Status = "running"
 	// Stopped indicates the vm has stopped.
-	Stopped            Status = "stopped"
+	Stopped Status = "stopped"
+	// Starting indicated the vm is in the process of starting
+	Starting           Status = "starting"
 	DefaultMachineName string = "podman-machine-default"
 )
 
@@ -62,7 +64,7 @@ var (
 	DefaultIgnitionUserName                      = "core"
 	ErrNoSuchVM                                  = errors.New("VM does not exist")
 	ErrVMAlreadyExists                           = errors.New("VM already exists")
-	ErrVMAlreadyRunning                          = errors.New("VM already running")
+	ErrVMAlreadyRunning                          = errors.New("VM already running or starting")
 	ErrMultipleActiveVM                          = errors.New("only one VM can be active at a time")
 	ForwarderBinaryName                          = "gvproxy"
 )
@@ -88,6 +90,7 @@ type ListResponse struct {
 	CreatedAt      time.Time
 	LastUp         time.Time
 	Running        bool
+	Starting       bool
 	Stream         string
 	VMType         string
 	CPUs           uint64
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 511dc23d5..bf724f685 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -910,7 +910,7 @@ func (v *MachineVM) State(bypass bool) (machine.Status, error) {
 	}
 	// Check if we can dial it
 	if v.Starting && !bypass {
-		return "", nil
+		return machine.Starting, nil
 	}
 	monitor, err := qmp.NewSocketMonitor(v.QMPMonitor.Network, v.QMPMonitor.Address.GetPath(), v.QMPMonitor.Timeout)
 	if err != nil {
@@ -1080,8 +1080,11 @@ func getVMInfos() ([]*machine.ListResponse, error) {
 					return err
 				}
 			}
-			if state == machine.Running {
+			switch state {
+			case machine.Running:
 				listEntry.Running = true
+			case machine.Starting:
+				listEntry.Starting = true
 			}
 
 			listed = append(listed, listEntry)
@@ -1114,7 +1117,7 @@ func (p *Provider) CheckExclusiveActiveVM() (bool, string, error) {
 		return false, "", errors.Wrap(err, "error checking VM active")
 	}
 	for _, vm := range vms {
-		if vm.Running {
+		if vm.Running || vm.Starting {
 			return true, vm.Name, nil
 		}
 	}
diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
index 0b2874baf..aeacf9b90 100644
--- a/pkg/machine/wsl/machine.go
+++ b/pkg/machine/wsl/machine.go
@@ -1312,6 +1312,7 @@ func GetVMInfos() ([]*machine.ListResponse, error) {
 			listEntry.RemoteUsername = vm.RemoteUsername
 			listEntry.Port = vm.Port
 			listEntry.IdentityPath = vm.IdentityPath
+			listEntry.Starting = false
 
 			running := vm.isRunning()
 			listEntry.CreatedAt, listEntry.LastUp, _ = vm.updateTimeStamps(running)
-- 
cgit v1.2.3-54-g00ecf