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

[v3.4] backport: utils: reintroduce moveToCgroup #12540

Merged

Conversation

edsantiago
Copy link
Member

commit ee62711 introduced the
regression.

It was mistakenly removed as part of a cleanup, but this code is
needed by another code path, where we move conmon for the exec session
to the same cgroup used by conmon for the process.

Closes: #12535

[NO NEW TESTS NEEDED] it fixes a regression in the CI

Signed-off-by: Giuseppe Scrivano [email protected]

commit ee62711 introduced the
regression.

It was mistakenly removed as part of a cleanup, but this code is
needed by another code path, where we move conmon for the exec session
to the same cgroup used by conmon for the process.

Closes: containers#12535

[NO NEW TESTS NEEDED] it fixes a regression in the CI

Signed-off-by: Giuseppe Scrivano <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 8, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 8, 2021
@jnovy
Copy link
Contributor

jnovy commented Dec 8, 2021

LGTM

@edsantiago
Copy link
Member Author

If this branch is going to see more activity, we may want to backport #12519

@edsantiago
Copy link
Member Author

@containers/podman-maintainers CI is now green after two restarted flakes. PTAL.

Even if approved, we still can't cut a new release until #10710 is addressed.

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM, thank you.

@mheon
Copy link
Member

mheon commented Dec 8, 2021

@edsantiago That's going to be problematic because the current read on that is that we need Conmon changes as well - and not exactly small ones.

@mheon
Copy link
Member

mheon commented Dec 8, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 8, 2021
@openshift-merge-robot openshift-merge-robot merged commit 7472aa1 into containers:v3.4 Dec 8, 2021
@edsantiago
Copy link
Member Author

@mheon for purposes of this release, "skip the stty test" is a perfectly valid resolution. We just can't ship as-is, because the stty bug is no longer a flake, it's failing way too often and will never pass gating.

@mheon
Copy link
Member

mheon commented Dec 8, 2021

Disabling this test for the v3.4 (and, if required, v3.4-2-rhel) branches SGTM. I do not see us creating a fix for this that also backports cleanly.

@edsantiago edsantiago deleted the backport_movetocgroup branch December 8, 2021 14:54
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants