opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3173 from giuseppe/use-wait-for-file

Browse Source 
libpod: prefer WaitForFile to polling
This commit is contained in:
OpenShift Merge Robot
2019-05-21 22:08:17 +02:00
committed by GitHub
parent 536fd6addd 3788da9344
commit 1cf9a1bdba
2 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libpod/container_internal.go
View File

@ -25,7 +25,6 @@ import (
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
kwait "k8s.io/apimachinery/pkg/util/wait"
) )
const ( const (
@ -146,20 +145,10 @@ func (c *Container) exitFilePath() string {
func (c *Container) waitForExitFileAndSync() error { func (c *Container) waitForExitFileAndSync() error {
exitFile := c.exitFilePath() exitFile := c.exitFilePath()
err := kwait.ExponentialBackoff( chWait := make(chan error)
kwait.Backoff{ defer close(chWait)
Duration: 500 * time.Millisecond,
Factor: 1.2, _, err := WaitForFile(exitFile, chWait, time.Second*5)
Steps: 6,
},
func() (bool, error) {
_, err := os.Stat(exitFile)
if err != nil {
// wait longer
return false, nil
}
return true, nil
})
if err != nil { if err != nil {
// Exit file did not appear // Exit file did not appear
// Reset our state // Reset our state

23
libpod/oci.go
View File

@ -17,7 +17,6 @@ import (
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
kwait "k8s.io/apimachinery/pkg/util/wait"
// TODO import these functions into libpod and remove the import // TODO import these functions into libpod and remove the import
// Trying to keep libpod from depending on CRI-O code // Trying to keep libpod from depending on CRI-O code
@ -261,21 +260,13 @@ func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRuntime bool) erro
// If we were, it should already be in the database // If we were, it should already be in the database
if ctr.state.State == ContainerStateStopped && oldState != ContainerStateStopped { if ctr.state.State == ContainerStateStopped && oldState != ContainerStateStopped {
var fi os.FileInfo var fi os.FileInfo
err = kwait.ExponentialBackoff( chWait := make(chan error)
kwait.Backoff{ defer close(chWait)
Duration: 500 * time.Millisecond,
Factor: 1.2, _, err := WaitForFile(exitFile, chWait, time.Second*5)
Steps: 6, if err == nil {
}, fi, err = os.Stat(exitFile)
func() (bool, error) { }
var err error
fi, err = os.Stat(exitFile)
if err != nil {
// wait longer
return false, nil
}
return true, nil
})
if err != nil { if err != nil {
ctr.state.ExitCode = -1 ctr.state.ExitCode = -1
ctr.state.FinishedTime = time.Now() ctr.state.FinishedTime = time.Now()