xds: fix a concurrency issue in CSDS ClientStatus responses #8795
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Fixes #8642 |
dapengzhang0
reviewed
Jan 5, 2022
sergiitk
commented
Jan 11, 2022
| @Override | ||
| Map<String, ResourceMetadata> getSubscribedResourcesMetadata(ResourceType type) { | ||
| Map<ResourceType, Map<String, ResourceMetadata>> getSubscribedResourcesMetadataSnapshot() { |
There was a problem hiding this comment.
Note: this was needed because I discovered this test to be false negative, see PR description:
Fix false negative in fetchClientConfig_unexpectedException,
where expected exception was actually caused by missing
bootstrap data, not by throwing error from the local
class implementation.
sergiitk
commented
Jan 11, 2022
Fixes an issue with ClientXdsClient.getSubscribedResourcesMetadata() executed out of shared synchronization context, and leading to: - each individual config dump containing outdated data when an xDS resource is updated during CsdsService preparing the response - config dumps for different services being out-of-sync with each other when any of the related xDS resources is updated during CsdsService preparing the response The fix replaces getSubscribedResourcesMetadata(ResourceType type) with atomic getSubscribedResourcesMetadataSnapshot() returning a snapshot of all resources for each type as they are at the moment of a CSDS request.
sergiitk
force-pushed
the
csds-fix-concurrency
branch
from
e0a40c7 to
b3a3914
Compare
|
Ready for another review. |
dapengzhang0
approved these changes
Jan 12, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes an issue with ClientXdsClient.getSubscribedResourcesMetadata()
executed out of shared synchronization context, and leading to:
an xDS resource is updated during CsdsService preparing the response
other when any of the related xDS resources is updated during
CsdsService preparing the response
The fix replaces getSubscribedResourcesMetadata(ResourceType type)
with atomic getSubscribedResourcesMetadataSnapshot() returning
a snapshot of all resources for each type as they are
at the moment of a CSDS request.
Fix false negative in fetchClientConfig_unexpectedException,
where expected exception was actually caused by missing
bootstrap data, not by throwing error from the local
class implementation.