Merge pull request #11457 from stepancheg:state-file

gvisor-bot · gvisor-bot · commit c8d5afe1d21c · 2025-02-12T12:15:52.000-08:00
PiperOrigin-RevId: 726147631
diff --git a/runsc/container/state_file.go b/runsc/container/state_file.go
@@ -383,8 +383,12 @@ func (s *StateFile) load(v any, opts LoadOpts) error {
 	}
 	defer s.UnlockOrDie()
 
-	metaBytes, err := os.ReadFile(s.statePath())
+	path := s.statePath()
+	metaBytes, err := os.ReadFile(path)
 	if err != nil {
+		// Caller of this function relies on error code, we cannot return new error,
+		// but we need to provide a message with file name.
+		log.Warningf("Error loading state file %q: %v", path, err)
 		return err
 	}
 	return json.Unmarshal(metaBytes, &v)

Original file line number	Diff line number	Diff line change
`@@ -383,8 +383,12 @@ func (s *StateFile) load(v any, opts LoadOpts) error {`
`383`	`383`	`}`
`384`	`384`	`defer s.UnlockOrDie()`
`385`	`385`
`386`		`- metaBytes, err := os.ReadFile(s.statePath())`
	`386`	`+ path := s.statePath()`
	`387`	`+ metaBytes, err := os.ReadFile(path)`
`387`	`388`	`if err != nil {`
	`389`	`+ // Caller of this function relies on error code, we cannot return new error,`
	`390`	`+ // but we need to provide a message with file name.`
	`391`	`+ log.Warningf("Error loading state file %q: %v", path, err)`
`388`	`392`	`return err`
`389`	`393`	`}`
`390`	`394`	`return json.Unmarshal(metaBytes, &v)`