Skip to content
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.

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

oci: Don't return early for non-tty attach if there is no stdin #3812

Conversation

mrunalp
Copy link
Member

@mrunalp mrunalp commented Jun 2, 2020

We want to return early from a non-tty attach only if stdin is
enabled otherwise we want to wait for the output as well.

Signed-off-by: Mrunal Patel mrunalp@gmail.com

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

This PR fixes a race exposed by recent changes in kubernetes/kubernetes#91227

Does this PR introduce a user-facing change?

None

We want to return early from a non-tty attach only if stdin is
enabled otherwise we want to wait for the output as well.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
@mrunalp mrunalp requested a review from runcom as a code owner June 2, 2020 00:18
@openshift-ci-robot openshift-ci-robot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Jun 2, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 2, 2020
@codecov
Copy link

codecov bot commented Jun 2, 2020

Codecov Report

Merging #3812 into master will not change coverage.
The diff coverage is 0.00%.

@@           Coverage Diff           @@
##           master    #3812   +/-   ##
=======================================
  Coverage   40.18%   40.18%           
=======================================
  Files         105      105           
  Lines        8692     8692           
=======================================
  Hits         3493     3493           
  Misses       4888     4888           
  Partials      311      311           

@mrunalp
Copy link
Member Author

mrunalp commented Jun 2, 2020

@haircommander @saschagrunert @giuseppe ptal. This fixes the tests.

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [mrunalp,saschagrunert]

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

@giuseppe
Copy link
Member

giuseppe commented Jun 2, 2020

woho green tests! I am fine to merge it but I still don't understand this requirement, why should we ignore stdout on c.stdin && !c.StdinOnce() && !tty, is this behaviour specified anywhere or is it some docker behavior?

@haircommander
Copy link
Member

it seems to be docker behavior. All of this is pretty poorly documented. Unfortunately, if a dockershim test passes and we fail, then we have to go to that :\

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 2, 2020
@openshift-merge-robot openshift-merge-robot merged commit e4995ca into cri-o:master Jun 2, 2020
@haircommander
Copy link
Member

/cherry-pick release-1.18

@openshift-cherrypick-robot

@haircommander: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/cri-o\n ! [remote rejected] cherry-pick-3812-to-release-1.18 -> cherry-pick-3812-to-release-1.18 (cannot lock ref 'refs/heads/cherry-pick-3812-to-release-1.18': reference already exists)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/openshift-cherrypick-robot/cri-o'\n", error: exit status 1

In response to this:

/cherry-pick release-1.18

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-cherrypick-robot

@haircommander: new pull request created: #3813

In response to this:

/cherry-pick release-1.18

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants