oci: properly handle tty on execsync #5107

haircommander · 2021-07-20T20:53:43Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

or else containers may have trouble accessing the terminal

Signed-off-by: Peter Hunt [email protected]

Which issue(s) this PR fixes:

Special notes for your reviewer:

The background here is a bit weird. I tried figuring out why we actually specified this in the first place. It seems we first introduced this when adding initial support for execsync with conmon: #310

As the file before that was just

cri-o/oci/oci.go

Line 181 in 61e60bf

    
           func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp *ExecSyncResponse, err error) {

which makes no mention of tty.

let's see what the tests think.

related to https://bugzilla.redhat.com/show_bug.cgi?id=1983205

edit: Turns out this is needed, for https://github.com/cri-o/cri-o/pull/1386/files and https://bugzilla.redhat.com/show_bug.cgi?id=1549029. changed the PR to account for this case

Does this PR introduce a user-facing change?

fix an issue where a container started with a terminal fails on exec sync calls

codecov · 2021-07-20T20:57:33Z

Codecov Report

Merging #5107 (04d36b3) into master (e06cce2) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

❗ Current head 04d36b3 differs from pull request most recent head 6351eec. Consider uploading reports for the commit 6351eec to get more accurate results

@@            Coverage Diff             @@
##           master    #5107      +/-   ##
==========================================
- Coverage   43.98%   43.95%   -0.03%     
==========================================
  Files         110      110              
  Lines       11437    11440       +3     
==========================================
- Hits         5030     5028       -2     
- Misses       5930     5935       +5     
  Partials      477      477

saschagrunert

LGTM

haircommander · 2021-07-21T14:49:35Z

ah we actually inhereited it in #1386. looking to make sure we don't break the same way we did

mrunalp · 2021-07-21T14:51:20Z

Discussed with @haircommander offline that this will regress https://github.com/cri-o/cri-o/pull/1386/files for https://bugzilla.redhat.com/show_bug.cgi?id=1549029.

haircommander · 2021-07-22T20:40:33Z

/retest

haircommander · 2021-07-23T15:37:55Z

/retest

or else containers may have trouble accessing the terminal Signed-off-by: Peter Hunt <[email protected]>

mrunalp

/lgtm

openshift-ci · 2021-07-23T16:32:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp, 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~~ [haircommander,mrunalp,saschagrunert]

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

haircommander · 2021-07-23T16:43:13Z

/cherry-pick release-1.21

openshift-cherrypick-robot · 2021-07-23T16:43:14Z

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.21 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.21

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.

haircommander · 2021-07-23T17:59:55Z

/override ci/openshift-jenkins/e2e_rhel

openshift-ci · 2021-07-23T17:59:57Z

@haircommander: Overrode contexts on behalf of haircommander: ci/openshift-jenkins/e2e_rhel

Details

In response to this:

/override ci/openshift-jenkins/e2e_rhel

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.

haircommander · 2021-07-23T18:30:09Z

/retest

openshift-ci · 2021-07-23T19:19:09Z

@haircommander: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2	`9dc5c92`	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.

haircommander · 2021-07-23T19:22:52Z

/retest

openshift-cherrypick-robot · 2021-07-23T20:11:39Z

@haircommander: new pull request created: #5121

Details

In response to this:

/cherry-pick release-1.21

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.

haircommander · 2021-07-23T20:15:23Z

/cherry-pick release-1.20

openshift-cherrypick-robot · 2021-07-23T20:16:03Z

@haircommander: new pull request created: #5122

Details

In response to this:

/cherry-pick release-1.20

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.

haircommander · 2021-07-23T20:16:22Z

/cherry-pick release-1.19

openshift-cherrypick-robot · 2021-07-23T20:17:03Z

@haircommander: new pull request created: #5123

Details

In response to this:

/cherry-pick release-1.19

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.

haircommander requested review from mrunalp and runcom as code owners July 20, 2021 20:53

openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Jul 20, 2021

openshift-ci bot requested review from rhatdan and saschagrunert July 20, 2021 20:53

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

haircommander force-pushed the exec-tty branch from c4b4de4 to 4ba83c6 Compare July 20, 2021 20:56

haircommander force-pushed the exec-tty branch from 4ba83c6 to 88df7ab Compare July 21, 2021 13:30

saschagrunert approved these changes Jul 21, 2021

View reviewed changes

haircommander force-pushed the exec-tty branch 5 times, most recently from 2a69a56 to 9dc5c92 Compare July 21, 2021 16:54

haircommander changed the title ~~oci: don't inherit tty from container on exec sync~~ oci: properly handle tty on execsync Jul 21, 2021

haircommander force-pushed the exec-tty branch from 9dc5c92 to 93a6339 Compare July 23, 2021 15:45

oci: properly handle tty on execsync

6351eec

or else containers may have trouble accessing the terminal Signed-off-by: Peter Hunt <[email protected]>

haircommander force-pushed the exec-tty branch from 93a6339 to 6351eec Compare July 23, 2021 15:45

mrunalp approved these changes Jul 23, 2021

View reviewed changes

openshift-ci bot assigned mrunalp Jul 23, 2021

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

openshift-merge-robot merged commit 0fc6d47 into cri-o:master Jul 23, 2021

openshift-cherrypick-robot mentioned this pull request Jul 23, 2021

[release-1.21] oci: properly handle tty on execsync #5121

Merged

openshift-cherrypick-robot mentioned this pull request Jul 23, 2021

[release-1.20] oci: properly handle tty on execsync #5122

Merged

openshift-cherrypick-robot mentioned this pull request Jul 23, 2021

[release-1.19] oci: properly handle tty on execsync #5123

Merged

haircommander mentioned this pull request Aug 23, 2021

oci: use conmon for exec again #5245

Merged

oci: properly handle tty on execsync #5107

oci: properly handle tty on execsync #5107

Uh oh!

Conversation

haircommander commented Jul 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

haircommander commented Jul 21, 2021

Uh oh!

mrunalp commented Jul 21, 2021

Uh oh!

haircommander commented Jul 22, 2021

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

mrunalp left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jul 23, 2021

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

openshift-cherrypick-robot commented Jul 23, 2021

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

openshift-ci bot commented Jul 23, 2021

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

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

Uh oh!

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

openshift-cherrypick-robot commented Jul 23, 2021

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

openshift-cherrypick-robot commented Jul 23, 2021

Uh oh!

haircommander commented Jul 23, 2021

Uh oh!

openshift-cherrypick-robot commented Jul 23, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

haircommander commented Jul 20, 2021 •

edited

Loading

codecov bot commented Jul 20, 2021 •

edited

Loading

openshift-ci bot commented Jul 23, 2021 •

edited

Loading