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

Jump to bottom

[1.17] bump storage to 01ee1656d552 #3583

Merged
merged 1 commit into from Apr 16, 2020
Merged

[1.17] bump storage to 01ee1656d552 #3583

merged 1 commit into from Apr 16, 2020

Conversation

haircommander
Copy link
Member

@haircommander haircommander commented Apr 15, 2020 •
edited

What type of PR is this?

/kind dependency-change

What this PR does / why we need it:

bumps c/storage to crio-release-1.17 which contains containers/storage@01ee165, as we saw


Apr 15 13:44:43 ip-10-0-129-128.us-east-2.compute.internal crio[70396]: panic: attempted to update last-writer in lockfile without the write lock
Apr 15 13:44:43 ip-10-0-129-128.us-east-2.compute.internal crio[70396]: goroutine 135 [running]:
Apr 15 13:44:43 ip-10-0-129-128.us-east-2.compute.internal crio[70396]: panic(0x560e8b171000, 0x560e8b4bc160)

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

fix containers/storage panic

@openshift-ci-robot openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/dependency-change Categorizes issue or PR as related to changing dependencies labels Apr 15, 2020
mrunalp
mrunalp reviewed Apr 15, 2020
View reviewed changes
docs/crio-status.8.tmp Outdated
@@ -0,0 +1,114 @@
<!-- This file has been autogenerated, please do not edit -->.TH "crio-status" "8" " A tool for CRI-O status retrieval"
Copy link
Member

Choose a reason for hiding this comment

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

Was this added my mistake?

Copy link
Member Author

Choose a reason for hiding this comment

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

hm weird

mrunalp
mrunalp reviewed Apr 15, 2020
View reviewed changes
docs/crio.conf.5.tmp Outdated
@@ -0,0 +1,388 @@
.TH "crio.conf" "5" " Kubernetes Container Runtime Daemon for Open Container Initiative Containers" "Aleksa Sarai" "OCTOBER 2016"
Copy link
Member

Choose a reason for hiding this comment

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

This also looks like a tmp file.

@mtnbikenc
Copy link

Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1779811

@haircommander
Copy link
Member Author

we should try to branch off of storage 1.16.6 instead of pulling in 1.18.2

@haircommander
bump containers storage to to crio-release-1.17: 01ee1656d55228
8073abd 
to fix a panic from double locking

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander haircommander changed the title [1.17] bump storage to 1.18.1 [1.17] bump storage to crio-release-1.17 containing 01ee1656d552 Apr 15, 2020
@haircommander haircommander changed the title [1.17] bump storage to crio-release-1.17 containing 01ee1656d552 [1.17] bump storage to 01ee1656d552 Apr 15, 2020
@haircommander
Copy link
Member Author

/retest

@codecov
Copy link

codecov bot commented Apr 15, 2020

Codecov Report

Merging #3583 into release-1.17 will not change coverage.
The diff coverage is n/a.

@@              Coverage Diff              @@
##           release-1.17    #3583   +/-   ##
=============================================
  Coverage         44.79%   44.79%           
=============================================
  Files                90       90           
  Lines              7608     7608           
=============================================
  Hits               3408     3408           
  Misses             3905     3905           
  Partials            295      295

@haircommander
Copy link
Member Author

/test e2e_features_fedora

@haircommander
Copy link
Member Author

/test integration_rhel

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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

1 similar comment
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 15, 2020
@haircommander
Copy link
Member Author

/test e2e-aws

@mrunalp
Copy link
Member

mrunalp commented Apr 15, 2020

/retest

1 similar comment
@mrunalp
Copy link
Member

mrunalp commented Apr 16, 2020

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 16, 2020 •
edited

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

Test name Commit Details Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2 8073abd link /test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2 8073abd link /test e2e_cgroupv2

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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

Could you bump to c/storage v1.17 or higher?

@umohnani8
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2020
@openshift-merge-robot openshift-merge-robot merged commit 3c317ec into cri-o:release-1.17 Apr 16, 2020
@haircommander
Copy link
Member Author

Could you bump to c/storage v1.17 or higher?

theoretically, but it would require many other version bumps, which at this stage I'm hesitant to do. Are there fixes in 1.17+ you think should be here @TomSweeneyRedHat

@TomSweeneyRedHat
Copy link
Contributor

My main concern is having a non-tagged release like this. I'd much prefer seeing a release tag such as 1.16.3 in the vendoring for future debugging. I think but I'm not sure you've the "DeleteContainer(): wait for all goroutines" fix that you put together that's in 1.18.1 in here. Also, the UID/GID fix for layers that went in for 1.17 would be good too.

@haircommander
Copy link
Member Author

I've moved cri-o 1.17 and 1.16 to use a storage branch crio-release-1.17, so we can keep getting vital patches into these branches without keeping up with, say, latest podman or c/common. this is a scheme we have with cri-o 1.13 as well. I don't think it's necessary to tag these branches as an official storage release, they're more of downstream branches to carry patches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp approved these changes

@runcom runcom Awaiting requested review from runcom runcom is a code owner

@sboeuf sboeuf Awaiting requested review from sboeuf

@vrothberg vrothberg Awaiting requested review from vrothberg

@saschagrunert saschagrunert Awaiting requested review from saschagrunert

Assignees

@umohnani8 umohnani8

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/dependency-change Categorizes issue or PR as related to changing dependencies lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@haircommander @mtnbikenc @openshift-ci-robot @mrunalp @TomSweeneyRedHat @umohnani8 @openshift-merge-robot