opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12404 from giuseppe/unlock-thread-only-on-success

Browse Source 
libpod: leave thread locked on errors
This commit is contained in:
OpenShift Merge Robot
2021-11-24 13:37:01 +01:00
committed by GitHub
parent 4b014a3aec c7ebaeee0e
commit 93138541f3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/oci_conmon_linux.go
View File

@ -847,10 +847,14 @@ func (r *ConmonOCIRuntime) CheckpointContainer(ctr *Container, options Container
err = utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, nil, r.path, args...) err = utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, nil, r.path, args...)
// Ignore error returned from SetSocketLabel("") call, // Ignore error returned from SetSocketLabel("") call,
// can't recover. // can't recover.
if labelErr := label.SetSocketLabel(""); labelErr != nil { if labelErr := label.SetSocketLabel(""); labelErr == nil {
// Unlock the thread only if the process label could be restored
// successfully. Otherwise leave the thread locked and the Go runtime
// will terminate it once it returns to the threads pool.
runtime.UnlockOSThread()
} else {
logrus.Errorf("Unable to reset socket label: %q", labelErr) logrus.Errorf("Unable to reset socket label: %q", labelErr)
} }
runtime.UnlockOSThread()
runtimeCheckpointDuration := func() int64 { runtimeCheckpointDuration := func() int64 {
if options.PrintStats { if options.PrintStats {
@ -1464,10 +1468,14 @@ func startCommandGivenSelinux(cmd *exec.Cmd, ctr *Container) error {
err = cmd.Start() err = cmd.Start()
// Ignore error returned from SetProcessLabel("") call, // Ignore error returned from SetProcessLabel("") call,
// can't recover. // can't recover.
if labelErr := label.SetProcessLabel(""); labelErr != nil { if labelErr := label.SetProcessLabel(""); labelErr == nil {
// Unlock the thread only if the process label could be restored
// successfully. Otherwise leave the thread locked and the Go runtime
// will terminate it once it returns to the threads pool.
runtime.UnlockOSThread()
} else {
logrus.Errorf("Unable to set process label: %q", labelErr) logrus.Errorf("Unable to set process label: %q", labelErr)
} }
runtime.UnlockOSThread()
return err return err
} }