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

delta-xds: resource state tracking after resource ingestion #23343

Merged

Conversation

adisuissa
Copy link
Contributor

Commit Message: delta-xds: resource state tracking after resource ingestion
Additional Description:
Fixes delta-xDS protocol resource state tracking.
Prior to this PR, the implementation updated the state of a resource (tracked version, TTL), even if the fetched config was NACKed. This PR changes it to only update the tracked state after a resource was successfully ingested, and an ACK will be sent.
Note that this PR impacts the TTL of a resource, as now TTL timer starts after the resource was ingested rather than before.
This PR is essentially #23214 (which was reverted in #23335) with more coverage.

Risk Level: Medium for delta-xDS usage.
Testing: Added unit tests.
Docs Changes: N/A.
Release Notes: Added release note.
Platform Specific Features: N/A.
Runtime guard: Can be reverted by setting envoy.reloadable_features.delta_xds_subscription_state_tracking_fix to false.
Fixes #20790

Signed-off-by: Adi Suissa-Peleg [email protected]

@adisuissa
Copy link
Contributor Author

/assign @htuch

Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Interesting, it seems like the earlier code you copy+pasted over the ingest line was missing coverage as well. LGTM.

@htuch htuch merged commit 3ed20a0 into envoyproxy:main Oct 4, 2022
@adisuissa
Copy link
Contributor Author

Interesting, it seems like the earlier code you copy+pasted over the ingest line was missing coverage as well. LGTM.

Indeed. It passed pre-submit, but by the time the PR was merged post-submit failed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants