Merge pull request #20299 from giuseppe/fix-flake-ENOENT

container: always check if mountpoint is mounted
This commit is contained in:
openshift-ci[bot]
2023-10-09 20:14:40 +00:00
committed by GitHub
5 changed files with 12 additions and 6 deletions

View File

@@ -3411,7 +3411,7 @@ func (s *store) Shutdown(force bool) ([]string, error) {
// so that we reload after a .Shutdown() the same way other processes would.
// Shutdown() is basically an error path, so reliability is more important than performance.
if _, err2 := s.graphLock.RecordWrite(); err2 != nil {
err = fmt.Errorf("(graphLock.RecordWrite failed: %w", err2)
err = fmt.Errorf("graphLock.RecordWrite failed: %w", err2)
}
// Do the Cleanup() only after we are sure that the change was recorded with RecordWrite(), so that
// the next user picks it.