Skip to content

Bug 2101357: concurrent write bug fix#337

Merged
openshift-ci[bot] merged 1 commit intoopenshift:masterfrom
perdasilva:concurrent_write_fix
Jul 13, 2022
Merged

Bug 2101357: concurrent write bug fix#337
openshift-ci[bot] merged 1 commit intoopenshift:masterfrom
perdasilva:concurrent_write_fix

Conversation

@perdasilva
Copy link
Copy Markdown
Contributor

@perdasilva perdasilva commented Jul 12, 2022

  • Update catalog source pod creation to not mutate parameters

Signed-off-by: perdasilva perdasilva@redhat.com

  • Update pkg/controller/registry/reconciler/reconciler_test.go

Co-authored-by: Alexander Greene agreene@redhat.com
Signed-off-by: perdasilva perdasilva@redhat.com

Co-authored-by: Alexander Greene agreene@redhat.com
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 83e3ebf96856643286e2e3e9438352c975923858

@openshift-ci openshift-ci Bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 12, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 12, 2022

@perdasilva: This pull request references Bugzilla bug 2101357, which is invalid:

  • expected the bug to target the "4.12.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 2101357: concurrent write bug fix

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 12, 2022
@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Jul 12, 2022

/bugzilla refresh

@openshift-ci openshift-ci Bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 12, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 12, 2022

@perdasilva: This pull request references Bugzilla bug 2101357, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.12.0) matches configured target release for branch (4.12.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

Details

In response to this:

/bugzilla refresh

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 requested a review from jianzhangbjz July 12, 2022 14:02
exdx
exdx approved these changes Jul 12, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@exdx exdx 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 openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 12, 2022
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 12, 2022

/retest-required

Remaining retests: 2 against base HEAD f79394b and 8 for PR HEAD dd690b0 in total

@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Jul 12, 2022

Note: we'll have to backport to 4.11

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 12, 2022

/retest-required

Remaining retests: 1 against base HEAD f79394b and 7 for PR HEAD dd690b0 in total

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 12, 2022

/retest-required

Remaining retests: 0 against base HEAD f79394b and 6 for PR HEAD dd690b0 in total

@jianzhangbjz
Copy link
Copy Markdown
Contributor

jianzhangbjz commented Jul 13, 2022

Looks good to me, details: https://bugzilla.redhat.com/show_bug.cgi?id=2101357#c10
/label qe-approved
/lgtm

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Jul 13, 2022
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 13, 2022

/retest-required

Remaining retests: 2 against base HEAD 761e3c3 and 5 for PR HEAD dd690b0 in total

@perdasilva @awgreene
Return copy of annotations in grpcCatalogSourceDecorator (#2813)
40cd45b 
* Update catalog source pod creation to not mutate parameters

Signed-off-by: perdasilva <perdasilva@redhat.com>

* Update pkg/controller/registry/reconciler/reconciler_test.go

Co-authored-by: Alexander Greene <agreene@redhat.com>
Signed-off-by: perdasilva <perdasilva@redhat.com>

Co-authored-by: Alexander Greene <agreene@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 83e3ebf96856643286e2e3e9438352c975923858
@perdasilva perdasilva force-pushed the concurrent_write_fix branch from dd690b0 to 40cd45b Compare July 13, 2022 14:01
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 13, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: exdx, perdasilva, timflannagan

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 [exdx,perdasilva,timflannagan]

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 lgtm Indicates that a PR is ready to be merged. label Jul 13, 2022
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 13, 2022

/retest-required

Remaining retests: 2 against base HEAD 761e3c3 and 8 for PR HEAD 40cd45b in total

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 13, 2022

/retest-required

Remaining retests: 1 against base HEAD 761e3c3 and 7 for PR HEAD 40cd45b in total

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 13, 2022

/retest-required

Remaining retests: 0 against base HEAD 761e3c3 and 6 for PR HEAD 40cd45b in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 13, 2022

@perdasilva: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-olm-flaky 40cd45b link false /test e2e-gcp-olm-flaky

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.

@openshift-ci openshift-ci Bot merged commit 7523679 into openshift:master Jul 13, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 13, 2022

@perdasilva: All pull requests linked via external trackers have merged:

Bugzilla bug 2101357 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2101357: concurrent write bug fix

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.

@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Aug 10, 2022

/cherry-pick release-4.11

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 10, 2022
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Aug 10, 2022

@perdasilva: new pull request created: #355

Details

In response to this:

/cherry-pick release-4.11

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.

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

Reviewers

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

2 more reviewers

@timflannagan timflannagan timflannagan approved these changes

@exdx exdx exdx approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@timflannagan timflannagan

@jianzhangbjz jianzhangbjz

@exdx exdx

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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.

6 participants

@perdasilva @openshift-ci-robot @jianzhangbjz @openshift-cherrypick-robot @timflannagan @exdx