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

Backport of [OSS] Fix initial_fetch_timeout to wait for all xDS resources into release/1.15.x #18064

Conversation

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

Backport

This PR is auto-generated from #18024 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:
@DanStough
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: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Description

Attempt 2 at closing #17283

Because we use the default initial_fetch_timeout in the Envoy bootstrap, not all Envoy resources may be loaded in busy systems. However, we previously relied on the timeout to start ingress and API gateways. This PR:

  1. Changes the default initial_fetch_timeout to wait indefinitely "0s".
  2. Changes the API and Ingress Gateway code to send empty xDS as long as watches return an empty response.

Links

Equivalent Dataplane PR


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/initial-fetch-timeout-permafix/blatantly-fitting-serval branch from e261d0a to b6f9561 Compare July 10, 2023 21:08
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/initial-fetch-timeout-permafix/blatantly-fitting-serval branch from b6f9561 to e261d0a Compare July 10, 2023 21:08
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 10, 2023

CLA assistant check
All committers have signed the CLA.

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-ui-staging July 10, 2023 21:12 Inactive
@DanStough DanStough force-pushed the backport/dans/initial-fetch-timeout-permafix/blatantly-fitting-serval branch from 4c60da2 to 08560d2 Compare July 10, 2023 21:27
@DanStough DanStough marked this pull request as ready for review July 10, 2023 21:27
@DanStough DanStough merged commit 9c4861b into release/1.15.x Jul 10, 2023
105 checks passed
@DanStough DanStough deleted the backport/dans/initial-fetch-timeout-permafix/blatantly-fitting-serval branch July 10, 2023 21:43
@jira jira bot mentioned this pull request Aug 28, 2023
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.

None yet

4 participants