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.

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

Jump to bottom

pass --syslog to the cleanup process #20062

Merged
merged 1 commit into from
Sep 20, 2023
Merged

pass --syslog to the cleanup process #20062

merged 1 commit into from
Sep 20, 2023

Conversation

vrothberg
Copy link
Member

@vrothberg vrothberg commented Sep 20, 2023 •
edited

The --syslog flag has not been passed to the cleanup process (i.e., conmon's exit args) complicating debugging quite a bit.

Does this PR introduce a user-facing change?

Fix a bug where the `--syslog` flag was not passed to the cleanup process.

Found while debugging #19938. I decided to break this out into a separate PR as #19938 is slowly turning into a much bigger adventure than I wished.

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 20, 2023
@vrothberg
pass --syslog to the cleanup process
4652a26 
The --syslog flag has not been passed to the cleanup process (i.e.,
conmon's exit args) complicating debugging quite a bit.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Luap99
Luap99 approved these changes Sep 20, 2023
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

edsantiago
edsantiago approved these changes Sep 20, 2023
View reviewed changes
Copy link
Collaborator

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

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

LGTM.

In your release note, "add the --syslog", could you either remove the, or add flag/option, or otherwise make it scan better?

test/system/030-run.bats

run_podman container inspect $cid --format "{{ .State.ConmonPid }}"
conmon_pid="$output"
is "$(< /proc/$conmon_pid/cmdline)" ".*--exit-command-arg--syslog.*" "conmon's exit-command has --syslog set"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Super minor, and no need to repush, but in future may I suggest assert instead of is?

    assert "..." =~ "--exit-command-arg--syslog" "conmon's ...."

Reasons:

  • is has some corner cases where it behaves counterintuitively
  • using =~, there's no need for the dot-stars

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago, Luap99, vrothberg

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 [Luap99,edsantiago,vrothberg]

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

@mheon
Copy link
Member

mheon commented Sep 20, 2023

/lgtm
/hold

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Sep 20, 2023
@vrothberg
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 20, 2023
@openshift-merge-robot openshift-merge-robot merged commit 639eb52 into containers:main Sep 20, 2023
98 checks passed
@vrothberg vrothberg deleted the syslog-fix branch September 22, 2023 08:25
@vrothberg
Copy link
Member Author

/cherry-pick v4.7

@openshift-cherrypick-robot
Copy link
Collaborator

@vrothberg: new pull request created: #20095

In response to this:

/cherry-pick v4.7

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 openshift-cherrypick-robot mentioned this pull request Sep 22, 2023
Merged
@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 Dec 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@edsantiago edsantiago edsantiago approved these changes

@Luap99 Luap99 Luap99 approved these changes

Assignees

@mheon mheon

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. release-note
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@vrothberg @mheon @openshift-cherrypick-robot @edsantiago @Luap99 @openshift-merge-robot