Skip to content

Backport of Fix to not create a watch to Internal.ServiceDump when mesh gateway is not used into release/1.15.x#20266

Merged
hashi-derek merged 13 commits intorelease/1.15.xfrom
backport/dhiaayachi/fix-service-dump-watch-wanfed/remarkably-valid-skink
Jan 19, 2024
Merged

Backport of Fix to not create a watch to Internal.ServiceDump when mesh gateway is not used into release/1.15.x#20266
hashi-derek merged 13 commits intorelease/1.15.xfrom
backport/dhiaayachi/fix-service-dump-watch-wanfed/remarkably-valid-skink

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #20168 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@hashi-derek
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "9b7973ad2ccb06b623a64002ec483e92b7406090", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

This add a fix to properly verify the gateway mode before creating a watch specific to mesh gateways. This watch have a high performance cost and when mesh gateways are not used is not used.

This also adds an optimization to only return the nodes when watching the Internal.ServiceDump RPC to avoid unnecessary disco chain compilation. As watches in proxy config only need the nodes.

Testing & Reproduction steps

Added a test to create a set of services with mesh gateway mode default and expecting that this watch is not effective.

Links

PR Checklist

  • updated test coverage
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dhiaayachi/fix-service-dump-watch-wanfed/remarkably-valid-skink branch from 09d9ae8 to 297880a Compare January 18, 2024 22:45
Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul January 18, 2024 22:56 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants