mirror of
https://github.com/containers/podman.git
synced 2025-06-22 18:08:11 +08:00
Fix interrupting machine start leaves the machine unstartable
Interrupting a `podman machine start` (ex: with CTRL-C) would leave `Starting: true` in the machine's config file. Due to #14469 any subsequent starts would fail since Podman would think the machine is still in the process of starting. Fixed here by listening for the interrupt signal and setting `Starting: false` in the event. [NO NEW TESTS NEEDED] Signed-off-by: Shane Smith <shane.smith@shopify.com>
This commit is contained in:
@ -16,9 +16,11 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/containers/common/pkg/config"
|
"github.com/containers/common/pkg/config"
|
||||||
@ -484,12 +486,26 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
|
|||||||
if err := v.writeConfig(); err != nil {
|
if err := v.writeConfig(); err != nil {
|
||||||
return fmt.Errorf("writing JSON file: %w", err)
|
return fmt.Errorf("writing JSON file: %w", err)
|
||||||
}
|
}
|
||||||
defer func() {
|
doneStarting := func() {
|
||||||
v.Starting = false
|
v.Starting = false
|
||||||
if err := v.writeConfig(); err != nil {
|
if err := v.writeConfig(); err != nil {
|
||||||
logrus.Errorf("Writing JSON file: %v", err)
|
logrus.Errorf("Writing JSON file: %v", err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
defer doneStarting()
|
||||||
|
|
||||||
|
c := make(chan os.Signal, 1)
|
||||||
|
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
||||||
|
go func() {
|
||||||
|
_, ok := <-c
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
doneStarting()
|
||||||
|
os.Exit(1)
|
||||||
}()
|
}()
|
||||||
|
defer close(c)
|
||||||
|
|
||||||
if v.isIncompatible() {
|
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)
|
logrus.Errorf("machine %q is incompatible with this release of podman and needs to be recreated, starting for recovery only", v.Name)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user