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

fix(kds): fix retry on NACK and add backoff (backport of #9736) #9858

Merged
merged 2 commits into from
Apr 11, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Apr 8, 2024

Automatic cherry-pick of #9736 for branch release-2.5

Generated by action

cherry-picked commit 4752f7b
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.5
Your branch is up to date with 'origin/release-2.5'.

You are currently cherry-picking commit 4752f7b82.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/events/interfaces.go
	modified:   pkg/kds/v2/reconcile/interfaces.go
	new file:   pkg/kds/v2/reconcile/reconcile_suite_test.go
	modified:   pkg/kds/v2/reconcile/reconciler.go
	new file:   pkg/kds/v2/reconcile/reconciler_test.go
	modified:   pkg/kds/v2/server/components.go
	modified:   pkg/kds/v2/server/event_based_watchdog.go
	modified:   pkg/kds/v2/server/event_based_watchdog_test.go
	modified:   pkg/kds/v2/server/resource_retry_forcer.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/framework/envs/multizone/env.go

Signed-off-by: slonka <[email protected]>
Signed-off-by: Jakub Dyszkiewicz <[email protected]>
Co-authored-by: Jakub Dyszkiewicz <[email protected]>
@kumahq kumahq bot requested a review from a team as a code owner April 8, 2024 13:59
@kumahq kumahq bot requested review from jakubdyszkiewicz, Automaat and lobkovilya and removed request for a team April 8, 2024 13:59
Signed-off-by: Jakub Dyszkiewicz <[email protected]>
@jakubdyszkiewicz jakubdyszkiewicz merged commit 99ee1a4 into release-2.5 Apr 11, 2024
5 checks passed
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/backport-release-2.5-9736 branch April 11, 2024 07:10
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.

2 participants