fix: report error if failed to remove layer

GZGavinZhao · GZGavinZhao · commit 804e83e08fe1 · 2025-03-28T21:25:28.000-04:00
Signed-off-by: Gavin Zhao &lt;git@gzgz.dev&gt;
diff --git a/builder/layer.go b/builder/layer.go
@@ -71,10 +71,12 @@ func (l *Layer) RequestOverlay(notif PidNotifier) (contentPath string, err error
 	}
 }
 
-func (l *Layer) RemoveIfNotCreated() {
+func (l *Layer) RemoveIfNotCreated() error {
 	if !l.created {
 		slog.Info("Removing incomplete layer", "path", l.BasePath())
-		os.RemoveAll(l.BasePath())
+		return os.RemoveAll(l.BasePath())
+	} else {
+		return nil
 	}
 }
 
diff --git a/builder/manager.go b/builder/manager.go
@@ -321,7 +321,9 @@ func (m *Manager) Cleanup() {
 
 	// Remove the layer if it's unfinished
 	if m.layer != nil {
-		m.layer.RemoveIfNotCreated()
+		if err := m.layer.RemoveIfNotCreated(); err != nil {
+			slog.Error("Failure in cleaning incomplete layer", "err", err)
+		}
 	}
 
 	// Finally clean out the lock files

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,12 @@ func (l *Layer) RequestOverlay(notif PidNotifier) (contentPath string, err error`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`-func (l *Layer) RemoveIfNotCreated() {`
	`74`	`+func (l *Layer) RemoveIfNotCreated() error {`
`75`	`75`	`if !l.created {`
`76`	`76`	`slog.Info("Removing incomplete layer", "path", l.BasePath())`
`77`		`- os.RemoveAll(l.BasePath())`
	`77`	`+ return os.RemoveAll(l.BasePath())`
	`78`	`+ } else {`
	`79`	`+ return nil`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,9 @@ func (m *Manager) Cleanup() {`
`321`	`321`
`322`	`322`	`// Remove the layer if it's unfinished`
`323`	`323`	`if m.layer != nil {`
`324`		`- m.layer.RemoveIfNotCreated()`
	`324`	`+ if err := m.layer.RemoveIfNotCreated(); err != nil {`
	`325`	`+ slog.Error("Failure in cleaning incomplete layer", "err", err)`
	`326`	`+ }`
`325`	`327`	`}`
`326`	`328`
`327`	`329`	`// Finally clean out the lock files`