oci: wait a while for exit file to show up

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-08-29 11:25:51 +02:00
parent f35147e23c
commit c2a4fc740f
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
2 changed files with 17 additions and 2 deletions

View file

@ -17,6 +17,7 @@ import (
rspec "github.com/opencontainers/runtime-spec/specs-go" rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
kwait "k8s.io/apimachinery/pkg/util/wait"
) )
const ( const (
@ -591,7 +592,22 @@ func (r *Runtime) UpdateStatus(c *Container) error {
if c.state.Status == ContainerStateStopped { if c.state.Status == ContainerStateStopped {
exitFilePath := filepath.Join(r.containerExitsDir, c.id) exitFilePath := filepath.Join(r.containerExitsDir, c.id)
fi, err := os.Stat(exitFilePath) var fi os.FileInfo
err = kwait.ExponentialBackoff(
kwait.Backoff{
Duration: 500 * time.Millisecond,
Factor: 1.2,
Steps: 6,
},
func() (bool, error) {
var err error
fi, err = os.Stat(exitFilePath)
if err != nil {
// wait longer
return false, nil
}
return true, nil
})
if err != nil { if err != nil {
logrus.Warnf("failed to find container exit file: %v", err) logrus.Warnf("failed to find container exit file: %v", err)
c.state.ExitCode = -1 c.state.ExitCode = -1

View file

@ -48,7 +48,6 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
// If we defaulted to exit code -1 earlier then we attempt to // If we defaulted to exit code -1 earlier then we attempt to
// get the exit code from the exit file again. // get the exit code from the exit file again.
// TODO: We could wait in UpdateStatus for exit file to show up.
if cState.ExitCode == -1 { if cState.ExitCode == -1 {
err := s.Runtime().UpdateStatus(c) err := s.Runtime().UpdateStatus(c)
if err != nil { if err != nil {