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

Revert "refactor(clustering/sync): clean the logic of sync_once" #13972

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

chronolaw
Copy link
Contributor

Reverts #13956, it may cause tests flaky.

@github-actions github-actions bot added core/clustering cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Dec 3, 2024
@chronolaw chronolaw requested a review from chobits December 3, 2024 08:36
@chronolaw chronolaw marked this pull request as ready for review December 3, 2024 08:57
@chronolaw chronolaw marked this pull request as draft December 3, 2024 09:44
@chronolaw chronolaw marked this pull request as ready for review December 3, 2024 09:55
@windmgc windmgc merged commit 9b2e133 into master Dec 3, 2024
36 of 38 checks passed
@windmgc windmgc deleted the revert-13956-refactor/clean_do_sync branch December 3, 2024 10:04
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13972-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13972-to-master-to-upstream
git checkout -b cherry-pick-13972-to-master-to-upstream
ancref=$(git merge-base 5e6b1f05f5e5a7b9543eb64004f3bb3dac8957e5 53c167da84ab83242373eeb7a575fe8dba7d80f6)
git cherry-pick -x $ancref..53c167da84ab83242373eeb7a575fe8dba7d80f6

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Dec 3, 2024
@chronolaw chronolaw removed cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention labels Dec 3, 2024
ProBrian pushed a commit that referenced this pull request Dec 13, 2024
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.

5 participants