mirror of
https://github.com/containers/podman.git
synced 2025-06-20 00:51:16 +08:00
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>
This commit is contained in:
@ -48,6 +48,7 @@ type ListReporter struct {
|
||||
Default bool
|
||||
Created string
|
||||
Running bool
|
||||
Starting bool
|
||||
LastUp string
|
||||
Stream string
|
||||
VMType string
|
||||
@ -224,10 +225,14 @@ func toHumanFormat(vms []*machine.ListResponse) ([]*ListReporter, error) {
|
||||
} else {
|
||||
response.Name = vm.Name
|
||||
}
|
||||
if vm.Running {
|
||||
switch {
|
||||
case vm.Running:
|
||||
response.LastUp = "Currently running"
|
||||
response.Running = true
|
||||
} else {
|
||||
case vm.Starting:
|
||||
response.LastUp = "Currently starting"
|
||||
response.Starting = true
|
||||
default:
|
||||
response.LastUp = units.HumanDuration(time.Since(vm.LastUp)) + " ago"
|
||||
}
|
||||
response.Created = units.HumanDuration(time.Since(vm.CreatedAt)) + " ago"
|
||||
|
@ -56,7 +56,7 @@ func start(_ *cobra.Command, args []string) error {
|
||||
if vmName == activeName {
|
||||
return errors.Wrapf(machine.ErrVMAlreadyRunning, "cannot start VM %s", vmName)
|
||||
}
|
||||
return errors.Wrapf(machine.ErrMultipleActiveVM, "cannot start VM %s. VM %s is currently running", vmName, activeName)
|
||||
return errors.Wrapf(machine.ErrMultipleActiveVM, "cannot start VM %s. VM %s is currently running or starting", vmName, activeName)
|
||||
}
|
||||
fmt.Printf("Starting machine %q\n", vmName)
|
||||
if err := vm.Start(vmName, machine.StartOptions{}); err != nil {
|
||||
|
@ -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
|
||||
|
@ -480,10 +480,6 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
|
||||
wait = time.Millisecond * 500
|
||||
)
|
||||
|
||||
if v.Starting {
|
||||
return fmt.Errorf("machine %q is already in the process of being started", v.Name)
|
||||
}
|
||||
|
||||
v.Starting = true
|
||||
if err := v.writeConfig(); err != nil {
|
||||
return fmt.Errorf("writing JSON file: %w", err)
|
||||
@ -908,7 +904,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 {
|
||||
@ -1079,8 +1075,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)
|
||||
@ -1113,7 +1112,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
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
|
Reference in New Issue
Block a user