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

Skip to content

crio wipe: only completely wipe storage after a reboot #4691

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-merge-robot merged 1 commit into from
Mar 26, 2021
Merged

crio wipe: only completely wipe storage after a reboot #4691

openshift-merge-robot merged 1 commit into from
Mar 26, 2021
+30 −24

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Mar 25, 2021

What type of PR is this?

/kind api-change
/kind bug
/kind ci
/kind cleanup
/kind dependency-change
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

We created the CleanShutdownFile to work around issues where nodes didn't have time
to sync changes to disk before rebooting. This caused an unclean reboot.

However, for this to be relevant, the node had to actually reboot. If it didn't,
we could fail to remove the storage because the containers are still running.

In this case, we shouldn't wipe anything.

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

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

fix a bug where crio wipe incorrectly wiped container storage even though the node wasn't rebooted

@openshift-ci-robot openshift-ci-robot 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 Mar 25, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 25, 2021
@codecov
Copy link

codecov bot commented Mar 25, 2021 •
edited
Loading

Codecov Report

Merging #4691 (6be4adf) into master (50b6b5c) will decrease coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 6be4adf differs from pull request most recent head 92098db. Consider uploading reports for the commit 92098db to get more accurate results

@@            Coverage Diff             @@
##           master    #4691      +/-   ##
==========================================
- Coverage   41.29%   41.27%   -0.03%     
==========================================
  Files         110      110              
  Lines        9596     9596              
==========================================
- Hits         3963     3961       -2     
- Misses       5182     5184       +2     
  Partials      451      451

@harche
Copy link
Contributor

harche commented Mar 25, 2021

Nice

@haircommander
Copy link
Member Author

haircommander commented Mar 25, 2021 •
edited
Loading

/cherry-pick release-1.21

wait ahh wrong one

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 25, 2021

@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
Copy link
Member Author

haircommander commented Mar 25, 2021

/cherry-pick release-1.20

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 25, 2021

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

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
crio wipe: only completely wipe storage after a reboot
92098db 
We created the CleanShutdownFile to work around issues where nodes didn't have time
to sync changes to disk before rebooting. This caused an unclean reboot.

However, for this to be relevant, the node had to actually reboot. If it didn't,
we could fail to remove the storage because the containers are still running.

In this case, we shouldn't wipe anything.

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

openshift-ci bot commented Mar 26, 2021 •
edited
Loading

@haircommander: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2 92098db link /test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2 92098db 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.

@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Mar 26, 2021

LGTM
assuming happy tests

@fidencio
Copy link
Contributor

fidencio commented Mar 26, 2021

LGTM

giuseppe
giuseppe approved these changes Mar 26, 2021
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 26, 2021

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2021
@openshift-merge-robot openshift-merge-robot merged commit 3cf4a99 into cri-o:master Mar 26, 2021
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 26, 2021

@haircommander: #4691 failed to apply on top of branch "release-1.20":

Applying: crio wipe: only completely wipe storage after a reboot
Using index info to reconstruct a base tree...
M	cmd/crio/wipe.go
M	test/crio-wipe.bats
M	test/helpers.bash
Falling back to patching base and 3-way merge...
Auto-merging test/helpers.bash
Auto-merging test/crio-wipe.bats
CONFLICT (content): Merge conflict in test/crio-wipe.bats
Auto-merging cmd/crio/wipe.go
CONFLICT (content): Merge conflict in cmd/crio/wipe.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 crio wipe: only completely wipe storage after a reboot
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
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.

@openshift-ci openshift-ci bot mentioned this pull request May 14, 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

@giuseppe giuseppe giuseppe approved these changes

@saschagrunert saschagrunert saschagrunert approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp

@runcom runcom Awaiting requested review from runcom

@nalind nalind Awaiting requested review from nalind

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@giuseppe giuseppe

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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@haircommander @harche @openshift-cherrypick-robot @TomSweeneyRedHat @fidencio @openshift-ci-robot @giuseppe @saschagrunert @openshift-merge-robot