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

littlejawa · 2021-06-28T14:12:29Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

When running ExecSync with a timeout, do not report an error, but make an ExecSyncResponse showing that a timeout occurred.

This PR copies the logic found in runtime_oci.go:ExecSyncContainer(), and applies it to runtime_vm.go:ExecSyncContainer(), so that both have the same behaviour.

Which issue(s) this PR fixes:

This issue was found by running the integration tests with Kata as the runtime.
The test "ctr execsync" was failing because the error reported on a timeout was not the one expected.
With this PR, the test passes.

Does this PR introduce a user-facing change?

none

When running ExecSync with a timeout, do not report an error, but make an ExecSyncResponse showing that a timeout occurred. Signed-off-by: Julien Ropé <[email protected]>

openshift-ci · 2021-06-28T14:12:38Z

Hi @littlejawa. Thanks for your PR.

I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

littlejawa · 2021-06-28T14:13:37Z

/cc @fidencio could you get a look?

haircommander · 2021-06-28T14:16:50Z

/ok-to-test

fidencio

@littlejawa, the patch itself looks good, but I'd like to see a test for this (could be here, could be as part of the kata-containers' bats).

Tomorrow I'll try to exercise this code locally and finally approve (or ask for chances in) this PR.

Thanks for working on this, @littlejawa!

internal/oci/runtime_vm.go

codecov · 2021-06-28T14:33:34Z

Codecov Report

Merging #5041 (a1a7041) into master (b67b4b5) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

❗ Current head a1a7041 differs from pull request most recent head 4bd79a0. Consider uploading reports for the commit 4bd79a0 to get more accurate results

@@            Coverage Diff             @@
##           master    #5041      +/-   ##
==========================================
- Coverage   41.72%   41.70%   -0.03%     
==========================================
  Files         108      108              
  Lines       10158    10163       +5     
==========================================
  Hits         4238     4238              
- Misses       5471     5476       +5     
  Partials      449      449

fidencio · 2021-06-28T15:05:36Z

@littlejawa, the patch itself looks good, but I'd like to see a test for this (could be here, could be as part of the kata-containers' bats).

Oh, I missed the fact this is fixing an issue found by thr ctr bats tests, sorry.
The comment about adding a new error still stands, though. :-)

fidencio · 2021-06-28T15:24:08Z

internal/oci/runtime_vm.go

+	if exitCode == execTimeout {
+		return &types.ExecSyncResponse{
+			Stderr:   []byte(conmonconfig.TimedOutMessage),
+			ExitCode: -1,


Is this one not changed on purpose?

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

fidencio · 2021-06-28T15:29:06Z

/ok-to-test

fidencio · 2021-06-28T15:30:28Z

/ok-to-test

Signed-off-by: Julien Ropé <[email protected]>

fidencio · 2021-06-28T21:03:15Z

LGTM, thanks @littlejawa!

@haircommander, @saschagrunert, may I bother you for your input here as well?

haircommander · 2021-06-29T13:27:02Z

/lgtm
/retest

haircommander · 2021-06-29T13:27:30Z

I'll let @saschagrunert give the approval :)

saschagrunert

/lgtm

openshift-ci · 2021-06-29T13:31:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: littlejawa, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [saschagrunert]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

saschagrunert · 2021-06-29T13:31:21Z

/override ci/prow/e2e-gcp

openshift-ci · 2021-06-29T13:31:24Z

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/e2e-gcp

Details

In response to this:

/override ci/prow/e2e-gcp

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2021-06-29T16:05:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T17:05:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T17:29:50Z

/retest

Please review the full test history for this PR and help us cut down flakes.

haircommander · 2021-06-29T17:48:39Z

/override ci/prow/e2e-gcp

openshift-ci · 2021-06-29T17:48:44Z

@haircommander: Overrode contexts on behalf of haircommander: ci/prow/e2e-gcp

Details

In response to this:

/override ci/prow/e2e-gcp

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2021-06-29T17:53:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T19:30:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T19:42:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T19:54:47Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T20:07:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-06-29T20:19:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-06-29T20:55:31Z

@littlejawa: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2	`4bd79a0`	link	`/test e2e_cgroupv2`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Enable this test on cri-o v1.22 and above, where the fix is available. (see: cri-o/cri-o#5041) Signed-off-by: Julien Ropé <[email protected]>

runtimeVM: ExecSync should return a recognizable error on timeout

2877425

When running ExecSync with a timeout, do not report an error, but make an ExecSyncResponse showing that a timeout occurred. Signed-off-by: Julien Ropé <[email protected]>

openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jun 28, 2021

openshift-ci bot requested review from kolyshkin and saschagrunert June 28, 2021 14:12

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 28, 2021

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 28, 2021

fidencio reviewed Jun 28, 2021

View reviewed changes

internal/oci/runtime_vm.go Outdated Show resolved Hide resolved

fidencio reviewed Jun 28, 2021

View reviewed changes

Define constants for execContainerCommon() error codes

4bd79a0

Signed-off-by: Julien Ropé <[email protected]>

littlejawa force-pushed the ctr_execsync branch from e20fc27 to 4bd79a0 Compare June 28, 2021 16:23

openshift-ci bot assigned haircommander Jun 29, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2021

saschagrunert approved these changes Jun 29, 2021

View reviewed changes

openshift-ci bot assigned saschagrunert Jun 29, 2021

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2021

openshift-merge-robot merged commit 9dd6f42 into cri-o:master Jun 29, 2021

littlejawa deleted the ctr_execsync branch October 26, 2021 14:57

littlejawa mentioned this pull request Jan 26, 2023

REQUEST: New reviewer status for littlejawa #6578

Closed

4 tasks

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

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

Uh oh!

Conversation

littlejawa commented Jun 28, 2021

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Jun 28, 2021

Uh oh!

littlejawa commented Jun 28, 2021

Uh oh!

haircommander commented Jun 28, 2021

Uh oh!

fidencio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Jun 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

fidencio commented Jun 28, 2021

Uh oh!

fidencio Jun 28, 2021

Choose a reason for hiding this comment

Uh oh!

littlejawa Jun 28, 2021

Choose a reason for hiding this comment

Uh oh!

fidencio commented Jun 28, 2021

Uh oh!

fidencio commented Jun 28, 2021

Uh oh!

fidencio commented Jun 28, 2021

Uh oh!

haircommander commented Jun 29, 2021

Uh oh!

haircommander commented Jun 29, 2021

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jun 29, 2021

Uh oh!

saschagrunert commented Jun 29, 2021

Uh oh!

openshift-ci bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

haircommander commented Jun 29, 2021

Uh oh!

openshift-ci bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-bot commented Jun 29, 2021

Uh oh!

openshift-ci bot commented Jun 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

codecov bot commented Jun 28, 2021 •

edited

Loading

openshift-ci bot commented Jun 29, 2021 •

edited

Loading