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

openshift-cherrypick-robot · 2024-07-10T13:11:34Z

This is an automated cherry-pick of #799

/assign ankitathomas

* fix sorting unpack jobs Signed-off-by: Ankita Thomas <[email protected]> * Add test cases to reproduce panic Signed-off-by: Catherine Chan-Tse <[email protected]> * handle nil jobs while sorting unpack jobs Signed-off-by: Ankita Thomas <[email protected]> --------- Signed-off-by: Ankita Thomas <[email protected]> Signed-off-by: Catherine Chan-Tse <[email protected]> Co-authored-by: Catherine Chan-Tse <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 20a3cbcde1f46ed7f4d56042ccc8b5d962e4d1b8

openshift-ci-robot · 2024-07-10T13:11:43Z

@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

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 · 2024-07-10T13:12:22Z

@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 ([email protected]), skipping review request.

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

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.

m1kola · 2024-07-11T14:33:04Z

/retest

jianzhangbjz · 2024-07-12T03:09:46Z

staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go

@@ -864,7 +876,7 @@ func sortUnpackJobs(jobs []*batchv1.Job, maxRetainedJobs int) (latest *batchv1.J
 	}

 	// 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++ {


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

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.

Aha, I see now, thanks!

ankitathomas · 2024-07-12T20:27:19Z

/retest

perdasilva · 2024-07-16T11:34:25Z

/retest

dtfranz · 2024-07-19T19:30:48Z

/retest

jianzhangbjz · 2024-07-22T02:11:33Z

/test e2e-gcp-olm

jianzhangbjz · 2024-07-22T02:12:16Z

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

openshift-ci-robot · 2024-07-22T02:12:22Z

@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 ([email protected]), skipping review request.

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.

jianzhangbjz · 2024-07-22T02:12:48Z

/approve

kevinrizza · 2024-07-22T15:22:00Z

/approve
/label backport-risk-assessed

openshift-ci · 2024-07-22T15:27:33Z

[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

Needs approval from an approver in each of these files:

~~DOWNSTREAM_OWNERS~~ [kevinrizza]

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

openshift-ci · 2024-07-22T18:02:26Z

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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-ci-robot · 2024-07-22T18:05:14Z

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

openshift/operator-framework-olm#817

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

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 · 2024-07-22T19:55:28Z

[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 · 2024-07-22T19:58:29Z

[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.

openshift-cherrypick-robot assigned ankitathomas Jul 10, 2024

openshift-cherrypick-robot mentioned this pull request Jul 10, 2024

[release-4.16] OCPBUGS-36137: fix sorting unpack jobs #799

Merged

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 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 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 bot requested review from perdasilva and tmshort July 10, 2024 13:17

jianzhangbjz reviewed Jul 12, 2024

View reviewed changes

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 bot assigned jianzhangbjz Jul 22, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2024

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 bot assigned bandrade, emmajiafan, KeenonLee and kuiwang02 Jul 22, 2024

openshift-ci bot assigned Xia-Zhao-rh Jul 22, 2024

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-merge-bot bot merged commit 9d4d9f8 into openshift:release-4.15 Jul 22, 2024
13 checks passed

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

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

Uh oh!

Conversation

openshift-cherrypick-robot commented Jul 10, 2024

Uh oh!

openshift-ci-robot commented Jul 10, 2024

Uh oh!

openshift-ci-robot commented Jul 10, 2024

Uh oh!

m1kola commented Jul 11, 2024

Uh oh!

jianzhangbjz Jul 12, 2024

Choose a reason for hiding this comment

Uh oh!

ankitathomas Jul 12, 2024

Choose a reason for hiding this comment

Uh oh!

jianzhangbjz Jul 22, 2024

Choose a reason for hiding this comment

Uh oh!

ankitathomas commented Jul 12, 2024

Uh oh!

perdasilva commented Jul 16, 2024

Uh oh!

dtfranz commented Jul 19, 2024

Uh oh!

jianzhangbjz commented Jul 22, 2024

Uh oh!

jianzhangbjz commented Jul 22, 2024

Uh oh!

openshift-ci-robot commented Jul 22, 2024

Uh oh!

jianzhangbjz commented Jul 22, 2024

Uh oh!

kevinrizza commented Jul 22, 2024

Uh oh!

openshift-ci bot commented Jul 22, 2024

Uh oh!

openshift-ci bot commented Jul 22, 2024

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 22, 2024

Uh oh!

openshift-bot commented Jul 22, 2024

Uh oh!

openshift-bot commented Jul 22, 2024

Uh oh!

Uh oh!