Merge pull request containers#18035 from n1hility/flush-config

Update podman to use atomic container and machine config updates
sstosh · Apr 11, 2023 · 4857c65 · 4857c65
2 parents 820976a + 3b2b144
commit 4857c65
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
@@ -29,6 +29,7 @@ import (
 	"github.com/containers/podman/v4/pkg/rootless"
 	"github.com/containers/podman/v4/utils"
 	"github.com/containers/storage/pkg/homedir"
+	"github.com/containers/storage/pkg/ioutils"
 	"github.com/digitalocean/go-qemu/qmp"
 	"github.com/docker/go-units"
 	"github.com/sirupsen/logrus"
@@ -1560,14 +1561,22 @@ func (v *MachineVM) writeConfig() error {
 		return err
 	}
 	// Write the JSON file
-	b, err := json.MarshalIndent(v, "", " ")
+	opts := &ioutils.AtomicFileWriterOptions{ExplicitCommit: true}
+	w, err := ioutils.NewAtomicFileWriterWithOpts(v.ConfigPath.GetPath(), 0644, opts)
 	if err != nil {
 		return err
 	}
-	if err := os.WriteFile(v.ConfigPath.GetPath(), b, 0644); err != nil {
+	defer w.Close()
+
+	enc := json.NewEncoder(w)
+	enc.SetIndent("", " ")
+
+	if err := enc.Encode(v); err != nil {
 		return err
 	}
-	return nil
+
+	// Commit the changes to disk if no errors
+	return w.Commit()
 }
 
 // getImageFile wrapper returns the path to the image used

diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
@@ -22,6 +22,7 @@ import (
 	"github.com/containers/podman/v4/pkg/machine"
 	"github.com/containers/podman/v4/utils"
 	"github.com/containers/storage/pkg/homedir"
+	"github.com/containers/storage/pkg/ioutils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
@@ -450,21 +451,22 @@ func downloadDistro(v *MachineVM, opts machine.InitOptions) error {
 func (v *MachineVM) writeConfig() error {
 	const format = "could not write machine json config: %w"
 	jsonFile := v.ConfigPath
-	tmpFile, err := getConfigPathExt(v.Name, "tmp")
-	if err != nil {
-		return err
-	}
 
-	b, err := json.MarshalIndent(v, "", " ")
+	opts := &ioutils.AtomicFileWriterOptions{ExplicitCommit: true}
+	w, err := ioutils.NewAtomicFileWriterWithOpts(jsonFile, 0644, opts)
 	if err != nil {
 		return fmt.Errorf(format, err)
 	}
+	defer w.Close()
 
-	if err := os.WriteFile(tmpFile, b, 0644); err != nil {
+	enc := json.NewEncoder(w)
+	enc.SetIndent("", " ")
+	if err := enc.Encode(v); err != nil {
 		return fmt.Errorf(format, err)
 	}
 
-	if err := os.Rename(tmpFile, jsonFile); err != nil {
+	// Commit the changes to disk if no error has occurred
+	if err := w.Commit(); err != nil {
 		return fmt.Errorf(format, err)
 	}