Merge pull request #13996 from cdoern/machine

machine starting status

6 files changed, 64 insertions, 23 deletions

diff --git a/capture.pcap b/capture.pcap
new file mode 100644
index 000000000..89b48a507
--- /dev/null
+++ b/capture.pcap
diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go
index d43cabf6b..1884cf94d 100644
--- a/cmd/podman/machine/inspect.go
+++ b/cmd/podman/machine/inspect.go
@@ -59,7 +59,7 @@ func inspect(cmd *cobra.Command, args []string) error {
 			errs = append(errs, err)
 			continue
 		}
-		state, err := vm.State()
+		state, err := vm.State(false)
 		if err != nil {
 			errs = append(errs, err)
 			continue
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index 6c2fab0e5..1103933cd 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -121,7 +121,7 @@ type VM interface {
 	Set(name string, opts SetOptions) error
 	SSH(name string, opts SSHOptions) error
 	Start(name string, opts StartOptions) error
-	State() (Status, error)
+	State(bypass bool) (Status, error)
 	Stop(name string, opts StopOptions) error
 }
 
diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go
index 7340de604..9473eef6f 100644
--- a/pkg/machine/qemu/config.go
+++ b/pkg/machine/qemu/config.go
@@ -86,6 +86,12 @@ type MachineVM struct {
 	ResourceConfig
 	// SSHConfig for accessing the remote vm
 	SSHConfig
+	// Starting tells us whether the machine is running or if we have just dialed it to start it
+	Starting bool
+	// Created contains the original created time instead of querying the file mod time
+	Created time.Time
+	// LastUp contains the last recorded uptime
+	LastUp time.Time
 }
 
 // ImageConfig describes the bootable image for the VM
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 69a986102..969acb760 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -94,6 +94,8 @@ func (p *Provider) NewMachine(opts machine.InitOptions) (machine.VM, error) {
 	vm.Memory = opts.Memory
 	vm.DiskSize = opts.DiskSize
 
+	vm.Created = time.Now()
+
 	// Find the qemu executable
 	cfg, err := config.Default()
 	if err != nil {
@@ -436,7 +438,7 @@ func (v *MachineVM) Set(_ string, opts machine.SetOptions) error {
 		return nil
 	}
 
-	state, err := v.State()
+	state, err := v.State(false)
 	if err != nil {
 		return err
 	}
@@ -477,6 +479,17 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 		wait           = time.Millisecond * 500
 	)
 
+	v.Starting = true
+	if err := v.writeConfig(); err != nil {
+		return fmt.Errorf("writing JSON file: %w", err)
+	}
+	defer func() error {
+		v.Starting = false
+		if err := v.writeConfig(); err != nil {
+			return fmt.Errorf("writing JSON file: %w", err)
+		}
+		return nil
+	}()
 	if v.isIncompatible() {
 		logrus.Errorf("machine %q is incompatible with this release of podman and needs to be recreated, starting for recovery only", v.Name)
 	}
@@ -498,6 +511,7 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 			return err
 		}
 	}
+
 	// If the qemusocketpath exists and the vm is off/down, we should rm
 	// it before the dial as to avoid a segv
 	if err := v.QMPMonitor.Address.Delete(); err != nil {
@@ -589,14 +603,14 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 		return err
 	}
 	if len(v.Mounts) > 0 {
-		state, err := v.State()
+		state, err := v.State(true)
 		if err != nil {
 			return err
 		}
 		listening := v.isListening()
 		for state != machine.Running || !listening {
 			time.Sleep(100 * time.Millisecond)
-			state, err = v.State()
+			state, err = v.State(true)
 			if err != nil {
 				return err
 			}
@@ -638,7 +652,6 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 	}
 
 	v.waitAPIAndPrintInfo(forwardState, forwardSock)
-
 	return nil
 }
 
@@ -647,9 +660,10 @@ func (v *MachineVM) checkStatus(monitor *qmp.SocketMonitor) (machine.Status, err
 	// {"return": {"status": "running", "singlestep": false, "running": true}}
 
 	type statusDetails struct {
-		Status  string `json:"status"`
-		Step    bool   `json:"singlestep"`
-		Running bool   `json:"running"`
+		Status   string `json:"status"`
+		Step     bool   `json:"singlestep"`
+		Running  bool   `json:"running"`
+		Starting bool   `json:"starting"`
 	}
 	type statusResponse struct {
 		Response statusDetails `json:"return"`
@@ -735,6 +749,11 @@ func (v *MachineVM) Stop(_ string, _ machine.StopOptions) error {
 	if p == nil && err != nil {
 		return err
 	}
+
+	v.LastUp = time.Now()
+	if err := v.writeConfig(); err != nil { // keep track of last up
+		return err
+	}
 	// Kill the process
 	if err := p.Kill(); err != nil {
 		return err
@@ -756,7 +775,7 @@ func (v *MachineVM) Stop(_ string, _ machine.StopOptions) error {
 	disconnected = true
 	waitInternal := 250 * time.Millisecond
 	for i := 0; i < 5; i++ {
-		state, err := v.State()
+		state, err := v.State(false)
 		if err != nil {
 			return err
 		}
@@ -808,7 +827,7 @@ func (v *MachineVM) Remove(_ string, opts machine.RemoveOptions) (string, func()
 	)
 
 	// cannot remove a running vm unless --force is used
-	state, err := v.State()
+	state, err := v.State(false)
 	if err != nil {
 		return "", nil, err
 	}
@@ -874,12 +893,19 @@ func (v *MachineVM) Remove(_ string, opts machine.RemoveOptions) (string, func()
 	}, nil
 }
 
-func (v *MachineVM) State() (machine.Status, error) {
+func (v *MachineVM) State(bypass bool) (machine.Status, error) {
 	// Check if qmp socket path exists
 	if _, err := os.Stat(v.QMPMonitor.Address.GetPath()); os.IsNotExist(err) {
 		return "", nil
 	}
+	err := v.update()
+	if err != nil {
+		return "", err
+	}
 	// Check if we can dial it
+	if v.Starting && !bypass {
+		return "", nil
+	}
 	monitor, err := qmp.NewSocketMonitor(v.QMPMonitor.Network, v.QMPMonitor.Address.GetPath(), v.QMPMonitor.Timeout)
 	if err != nil {
 		// FIXME: this error should probably be returned
@@ -910,7 +936,7 @@ func (v *MachineVM) isListening() bool {
 // SSH opens an interactive SSH session to the vm specified.
 // Added ssh function to VM interface: pkg/machine/config/go : line 58
 func (v *MachineVM) SSH(_ string, opts machine.SSHOptions) error {
-	state, err := v.State()
+	state, err := v.State(true)
 	if err != nil {
 		return err
 	}
@@ -1024,20 +1050,29 @@ func getVMInfos() ([]*machine.ListResponse, error) {
 			listEntry.Port = vm.Port
 			listEntry.RemoteUsername = vm.RemoteUsername
 			listEntry.IdentityPath = vm.IdentityPath
-			fi, err := os.Stat(fullPath)
-			if err != nil {
-				return err
+			listEntry.CreatedAt = vm.Created
+
+			if listEntry.CreatedAt.IsZero() {
+				listEntry.CreatedAt = time.Now()
+				vm.Created = time.Now()
+				if err := vm.writeConfig(); err != nil {
+					return err
+				}
 			}
-			listEntry.CreatedAt = fi.ModTime()
 
-			fi, err = os.Stat(vm.getImageFile())
+			state, err := vm.State(false)
 			if err != nil {
 				return err
 			}
-			listEntry.LastUp = fi.ModTime()
-			state, err := vm.State()
-			if err != nil {
-				return err
+
+			if !vm.LastUp.IsZero() {
+				listEntry.LastUp = vm.LastUp
+			} else {
+				listEntry.LastUp = vm.Created
+				vm.Created = time.Now()
+				if err := vm.writeConfig(); err != nil {
+					return err
+				}
 			}
 			if state == machine.Running {
 				listEntry.Running = true
diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
index 38bd4e96d..f57dbd299 100644
--- a/pkg/machine/wsl/machine.go
+++ b/pkg/machine/wsl/machine.go
@@ -1028,7 +1028,7 @@ func (v *MachineVM) Stop(name string, _ machine.StopOptions) error {
 
 // TODO: We need to rename isRunning to State(); I do not have a
 // windows system to test this on.
-func (v *MachineVM) State() (machine.Status, error) {
+func (v *MachineVM) State(bypass bool) (machine.Status, error) {
 	return "", define.ErrNotImplemented
 }