Skip to content

[release-v1.15] MT-Broker: return retriable status code based on the state to leverage retries #972

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift-knative:release-v1.15from
pierDipi:cp-05936eaa9bb2e4a68071e8d625134f2c7dbc1c7d-v1.15
Dec 3, 2024
Merged

[release-v1.15] MT-Broker: return retriable status code based on the state to leverage retries #972
openshift-merge-bot[bot] merged 1 commit into
openshift-knative:release-v1.15from
pierDipi:cp-05936eaa9bb2e4a68071e8d625134f2c7dbc1c7d-v1.15

Conversation

@pierDipi
Copy link
Copy Markdown
Member

@pierDipi pierDipi commented Dec 3, 2024

This is a cherry-pick of knative#8366

…e retries (knative#8366)

* MT-Broker: return appropriate status code based on the state to leverage retries

The ingress or filter deployments were returning 400 even in the case
where a given resource (like trigger, broker, subscription) wasn't
found, however, this is a common case where the lister cache
hasn't caught up with the latest state.

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Fix unit tests

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
@pierDipi pierDipi changed the title [release-v1.16] MT-Broker: return retriable status code based on the state to leverage retries [release-v1.15] MT-Broker: return retriable status code based on the state to leverage retries Dec 3, 2024
@openshift-ci openshift-ci Bot requested review from creydr and matzew December 3, 2024 12:58
@openshift-ci openshift-ci Bot added the approved label Dec 3, 2024
Copy link
Copy Markdown
Member

@matzew matzew left a comment

Choose a reason for hiding this comment

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

/lgtm
/apporve

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Dec 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew, pierDipi

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-merge-bot openshift-merge-bot Bot merged commit d16dbee into openshift-knative:release-v1.15 Dec 3, 2024
@matzew
Copy link
Copy Markdown
Member

matzew commented Dec 4, 2024

/cherry-pick release-v1.16

@openshift-cherrypick-robot
Copy link
Copy Markdown

@matzew: #972 failed to apply on top of branch "release-v1.16":

Applying: MT-Broker: return retriable status code based on the state to leverage retries (#8366)
Using index info to reconstruct a base tree...
M	pkg/broker/filter/filter_handler.go
M	pkg/broker/filter/filter_handler_test.go
M	pkg/broker/ingress/ingress_handler.go
M	pkg/broker/ingress/ingress_handler_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/broker/ingress/ingress_handler_test.go
CONFLICT (content): Merge conflict in pkg/broker/ingress/ingress_handler_test.go
Auto-merging pkg/broker/ingress/ingress_handler.go
Auto-merging pkg/broker/filter/filter_handler_test.go
CONFLICT (content): Merge conflict in pkg/broker/filter/filter_handler_test.go
Auto-merging pkg/broker/filter/filter_handler.go
CONFLICT (content): Merge conflict in pkg/broker/filter/filter_handler.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 MT-Broker: return retriable status code based on the state to leverage retries (#8366)

Details

In response to this:

/cherry-pick release-v1.16

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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants