Thanks to visit codestin.com
Credit goes to github.com

Skip to content

main: Don't log an error if the clean shutdown file doesn't exist #5144

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
Merged
openshift-ci merged 1 commit into from
Jul 30, 2021
Merged

main: Don't log an error if the clean shutdown file doesn't exist #5144

openshift-ci merged 1 commit into from
Jul 30, 2021

Conversation

@cgwalters
Copy link
Contributor

@cgwalters cgwalters commented Jul 30, 2021 •
edited
Loading

This showed up when I was grepping a journal for error:, and it's
not an error.

NONE

@cgwalters cgwalters requested review from mrunalp and runcom as code owners July 30, 2021 15:15
@openshift-ci openshift-ci bot added dco-signoff: no Indicates the PR's author has not DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 30, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 30, 2021

Hi @cgwalters. 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.

@openshift-ci 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 Jul 30, 2021
@openshift-ci openshift-ci bot requested review from fidencio and sameo July 30, 2021 15:15
@cgwalters cgwalters force-pushed the cleanshutdown-not-error branch from 38c4468 to fc6c5fa Compare July 30, 2021 15:15
@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. release-note-none Denotes a PR that doesn't merit a release note. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 30, 2021
@haircommander
Copy link
Member

haircommander commented Jul 30, 2021

good point, thanks for the PR

/ok-to-test
/approve

@openshift-ci 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 Jul 30, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 30, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, haircommander

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:

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 Jul 30, 2021
@codecov
Copy link

codecov bot commented Jul 30, 2021 •
edited
Loading

Codecov Report

Merging #5144 (a6486d8) into master (6ac8cee) will not change coverage.
The diff coverage is n/a.

❗ Current head a6486d8 differs from pull request most recent head 73d44bd. Consider uploading reports for the commit 73d44bd to get more accurate results

@@           Coverage Diff           @@
##           master    #5144   +/-   ##
=======================================
  Coverage   43.93%   43.93%           
=======================================
  Files         110      110           
  Lines       11453    11453           
=======================================
  Hits         5032     5032           
  Misses       5944     5944           
  Partials      477      477

@haircommander
Copy link
Member

haircommander commented Jul 30, 2021

/retest

@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Jul 30, 2021

LGTM
assuming happy tests

haircommander
haircommander reviewed Jul 30, 2021
View reviewed changes
cmd/crio/main.go Outdated
if err := os.Remove(config.CleanShutdownFile); err != nil {
// not a fatal error, as it could have been cleaned up
if err := os.Remove(config.CleanShutdownFile); err != nil && !os.IsNotExist(err) {
// continue anyways
Copy link
Member

@haircommander haircommander Jul 30, 2021

Choose a reason for hiding this comment

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

apparently the linter thinks this is a commented out continue 🙃

Copy link
Contributor Author

@cgwalters cgwalters Jul 30, 2021

Choose a reason for hiding this comment

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

Hah. I removed it so we can continue

@cgwalters
main: Don't log an error if the clean shutdown file doesn't exist
73d44bd 
This showed up when I was grepping a journal for `error:`, and it's
not an error.

Signed-off-by: Colin Walters <[email protected]>
@cgwalters cgwalters force-pushed the cleanshutdown-not-error branch from fc6c5fa to 73d44bd Compare July 30, 2021 20:20
@haircommander
Copy link
Member

haircommander commented Jul 30, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 30, 2021
@openshift-ci openshift-ci bot merged commit 1b8b9e4 into cri-o:master Jul 30, 2021
@haircommander
Copy link
Member

haircommander commented Aug 19, 2021

/cherry-pick release-1.21

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 19, 2021

@haircommander: new pull request created: #5227

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 19, 2021
Merged
This was referenced Aug 19, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@haircommander haircommander haircommander left review comments

@mrunalp mrunalp Awaiting requested review from mrunalp

@runcom runcom Awaiting requested review from runcom

@fidencio fidencio Awaiting requested review from fidencio

@sameo sameo Awaiting requested review from sameo

Assignees

@haircommander haircommander

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@cgwalters @haircommander @TomSweeneyRedHat @openshift-cherrypick-robot