Thanks to visit codestin.com
Credit goes to github.com

Skip to content

runtimeVM: ExecSync should return a recognizable error on timeout #5041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jun 29, 2021
Merged

runtimeVM: ExecSync should return a recognizable error on timeout #5041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2877425
runtimeVM: ExecSync should return a recognizable error on timeout
littlejawa Jun 28, 2021
4bd79a0
Define constants for execContainerCommon() error codes
littlejawa Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions internal/oci/runtime_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/containerd/containerd/runtime/v2/task"
"github.com/containerd/ttrpc"
"github.com/containerd/typeurl"
conmonconfig "github.com/containers/conmon/runner/config"
"github.com/cri-o/cri-o/internal/log"
"github.com/cri-o/cri-o/server/cri/types"
"github.com/cri-o/cri-o/server/metrics"
Expand Down Expand Up @@ -53,6 +54,11 @@ type containerInfo struct {
cio *cio.ContainerIO
}

const (
execError = -1
execTimeout = -2
)

// newRuntimeVM creates a new runtimeVM instance
func newRuntimeVM(path, root string) RuntimeImpl {
logrus.Debug("oci.newRuntimeVM() start")
Expand Down Expand Up @@ -318,6 +324,14 @@ func (r *runtimeVM) ExecSyncContainer(ctx context.Context, c *Container, command
return nil, errors.Wrap(err, "ExecSyncContainer failed")
}

// if the execution stopped because of the timeout, report it as such
if exitCode == execTimeout {
return &types.ExecSyncResponse{
Stderr: []byte(conmonconfig.TimedOutMessage),
ExitCode: -1,
Copy link
Contributor

@fidencio fidencio Jun 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this one not changed on purpose?

Copy link
Contributor Author

@littlejawa littlejawa Jun 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. According to the equivalent code un runtime_oci.go, this is what the caller expects.

}, nil
}

return &types.ExecSyncResponse{
Stdout: stdoutBuf.Bytes(),
Stderr: stderrBuf.Bytes(),
Expand All @@ -336,13 +350,13 @@ func (r *runtimeVM) execContainerCommon(ctx context.Context, c *Container, cmd [
// Generate a unique execID
execID, err := utils.GenerateID()
if err != nil {
return -1, errors.Wrap(err, "exec container")
return execError, errors.Wrap(err, "exec container")
}

// Create IO fifos
execIO, err := cio.NewExecIO(c.ID(), r.fifoDir, tty, stdin != nil)
if err != nil {
return -1, errdefs.FromGRPC(err)
return execError, errdefs.FromGRPC(err)
}
defer execIO.Close()

Expand Down Expand Up @@ -373,7 +387,7 @@ func (r *runtimeVM) execContainerCommon(ctx context.Context, c *Container, cmd [

any, err := typeurl.MarshalAny(pSpec)
if err != nil {
return -1, errdefs.FromGRPC(err)
return execError, errdefs.FromGRPC(err)
}

request := &task.ExecProcessRequest{
Expand All @@ -388,7 +402,7 @@ func (r *runtimeVM) execContainerCommon(ctx context.Context, c *Container, cmd [

// Create the "exec" process
if _, err = r.task.Exec(r.ctx, request); err != nil {
return -1, errdefs.FromGRPC(err)
return execError, errdefs.FromGRPC(err)
}

defer func() {
Expand All @@ -401,7 +415,7 @@ func (r *runtimeVM) execContainerCommon(ctx context.Context, c *Container, cmd [

// Start the process
if err := r.start(c.ID(), execID); err != nil {
return -1, err
return execError, err
}

// close closeIOChan to notify execIO exec has started.
Expand Down Expand Up @@ -444,16 +458,17 @@ func (r *runtimeVM) execContainerCommon(ctx context.Context, c *Container, cmd [
case err = <-execCh:
if err != nil {
if killErr := r.kill(c.ID(), execID, syscall.SIGKILL, false); killErr != nil {
return -1, killErr
return execError, killErr
}
return -1, err
return execError, err
}
case <-timeoutCh:
if killErr := r.kill(c.ID(), execID, syscall.SIGKILL, false); killErr != nil {
return -1, killErr
return execError, killErr
}
<-execCh
return -1, errors.Errorf("ExecSyncContainer timeout (%v)", timeoutDuration)
// do not make an error for timeout: report it with a specific error code
return execTimeout, nil
}

if err == nil {
Expand Down