Skip to content

[release-4.15] OCPBUGS-36812: fix sorting unpack jobs#817

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.15from
openshift-cherrypick-robot:cherry-pick-799-to-release-4.15
Jul 22, 2024
Merged

[release-4.15] OCPBUGS-36812: fix sorting unpack jobs#817
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.15from
openshift-cherrypick-robot:cherry-pick-799-to-release-4.15

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jul 10, 2024

This is an automated cherry-pick of #799

/assign ankitathomas

@ankitathomas @oceanc80
fix sorting unpack jobs (#3299)
ea32706 
* fix sorting unpack jobs

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

* Add test cases to reproduce panic

Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>

* handle nil jobs while sorting unpack jobs

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

---------

Signed-off-by: Ankita Thomas <ankithom@redhat.com>
Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
Co-authored-by: Catherine Chan-Tse <cchantse@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 20a3cbcde1f46ed7f4d56042ccc8b5d962e4d1b8
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 10, 2024
Merged
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 10, 2024

@openshift-cherrypick-robot: Jira Issue OCPBUGS-36137 has been cloned as Jira Issue OCPBUGS-36812. Will retitle bug to link to clone.
/retitle [release-4.15] OCPBUGS-36812: fix sorting unpack jobs

Details

In response to this:

This is an automated cherry-pick of #799

/assign ankitathomas

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot changed the title [release-4.15] OCPBUGS-36137: fix sorting unpack jobs [release-4.15] OCPBUGS-36812: fix sorting unpack jobs Jul 10, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jul 10, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 10, 2024

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-36812, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-36137 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-36137 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #799

/assign ankitathomas

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 10, 2024
@openshift-ci openshift-ci Bot requested review from perdasilva and tmshort July 10, 2024 13:17
@m1kola
Copy link
Copy Markdown
Contributor

m1kola commented Jul 11, 2024

/retest

jianzhangbjz
jianzhangbjz reviewed Jul 12, 2024
View reviewed changes
Comment thread staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go

// cleanup old failed jobs, n-1 recent jobs and the oldest job
for i := 0; i < maxRetainedJobs && i+maxRetainedJobs < len(jobs); i++ {
for i := 0; i < maxRetainedJobs && i+maxRetainedJobs < len(jobs)-1; i++ {
Copy link
Copy Markdown
Contributor

@jianzhangbjz jianzhangbjz Jul 12, 2024

Choose a reason for hiding this comment

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

Hi @ankitathomas, one concern here, if we use the < len(jobs)-1 here, it never returns the last child, which means will retain 6 jobs instead of 5. Is it as expected? Thanks!

maxRetainedJobs := 5                                  // TODO: make this configurable

Copy link
Copy Markdown
Contributor

@ankitathomas ankitathomas Jul 12, 2024

Choose a reason for hiding this comment

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

That's a good question! The intention there is to preserve the oldest failing unpack job for debugging purposes when this issue happens again, even when it allows for retrying the unpack.

Copy link
Copy Markdown
Contributor

@jianzhangbjz jianzhangbjz Jul 22, 2024

Choose a reason for hiding this comment

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

Aha, I see now, thanks!

@ankitathomas
Copy link
Copy Markdown
Contributor

ankitathomas commented Jul 12, 2024

/retest

2 similar comments
@perdasilva
Copy link
Copy Markdown
Contributor

perdasilva commented Jul 16, 2024

/retest

@dtfranz
Copy link
Copy Markdown
Contributor

dtfranz commented Jul 19, 2024

/retest

@jianzhangbjz
Copy link
Copy Markdown
Contributor

jianzhangbjz commented Jul 22, 2024

/test e2e-gcp-olm

@jianzhangbjz
Copy link
Copy Markdown
Contributor

jianzhangbjz commented Jul 22, 2024

/label qe-approved
/lgtm
/label cherry-pick-approved

@openshift-ci openshift-ci Bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jul 22, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 22, 2024

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-36812, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-36137 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-36137 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

Details

In response to this:

This is an automated cherry-pick of #799

/assign ankitathomas

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2024
@jianzhangbjz
Copy link
Copy Markdown
Contributor

jianzhangbjz commented Jul 22, 2024

/approve

@kevinrizza
Copy link
Copy Markdown
Member

kevinrizza commented Jul 22, 2024

/approve
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 22, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianzhangbjz, kevinrizza, openshift-cherrypick-robot

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 22, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 22, 2024

@openshift-cherrypick-robot: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit 9d4d9f8 into openshift:release-4.15 Jul 22, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 22, 2024

@openshift-cherrypick-robot: Jira Issue OCPBUGS-36812: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-36812 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #799

/assign ankitathomas

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 22, 2024

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202407221907.p0.g9d4d9f8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 22, 2024

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.15.0-202407221907.p0.g9d4d9f8.assembly.stream.el9.
All builds following this will include this PR.

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

Reviewers

@perdasilva perdasilva Awaiting requested review from perdasilva

@tmshort tmshort Awaiting requested review from tmshort

2 more reviewers

@ankitathomas ankitathomas ankitathomas left review comments

@jianzhangbjz jianzhangbjz jianzhangbjz left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@bandrade bandrade

@ankitathomas ankitathomas

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.