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(clustering/rpc): cascade deleting for incremental sync #13836

Merged
merged 7 commits into from
Nov 8, 2024

Conversation

chronolaw
Copy link
Contributor

Summary

KAG-5755

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

@github-actions github-actions bot added core/clustering cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Nov 6, 2024
@chronolaw chronolaw marked this pull request as ready for review November 6, 2024 01:35
@chronolaw chronolaw marked this pull request as draft November 6, 2024 02:35
@chronolaw chronolaw marked this pull request as ready for review November 6, 2024 02:58
@chronolaw chronolaw changed the title fix(clustering/rpc): cascade deleting for inc sync fix(clustering/rpc): cascade deleting for incremental sync Nov 6, 2024
@@ -161,8 +166,38 @@ function _M:register_dao_hooks()

ngx_log(ngx_DEBUG, "[kong.sync.v2] new delta due to deleting ", name)

-- set lmdb value to ngx_null then return row
return self:entity_delta_writer(entity, name, options, ws_id, true)
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that we lost this logic in the new patch? Is it intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, entity_delta_writer() only process one entity, but in deletion we may have many entities, but the basic logic is same, please compare to entity_delta_writer().

@ADD-SP ADD-SP merged commit 08de6fe into master Nov 8, 2024
26 checks passed
@ADD-SP ADD-SP deleted the fix/cascade_deleting_for_inc_sync branch November 8, 2024 00:59
@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-13836-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13836-to-master-to-upstream
git checkout -b cherry-pick-13836-to-master-to-upstream
ancref=$(git merge-base d4ab528fa2414d996861a43e58406c02b4978157 c77a50c7a859055b0c01251285acf6513abc2dda)
git cherry-pick -x $ancref..c77a50c7a859055b0c01251285acf6513abc2dda

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 8, 2024
@kikito kikito removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/clustering size/M skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants