Fix watch on clusters, by removing inner Arc #773
Merged
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
XAMPPRocky
requested review from
markmandel,
No-ops,
rezvaneh and
vallfors
as code owners
markmandel
approved these changes
Aug 10, 2023
src/xds/server.rs
Outdated
| tracing::info!("sending discovery request"); | ||
| crate::xds::client::MdsStream::discovery_request_without_cache(&identifier, &mut requests, crate::xds::ResourceType::Cluster, &[]) | ||
| .map_err(|error| tonic::Status::internal(error.to_string()))?; | ||
| // tracing::info!("sending discovery request"); |
There was a problem hiding this comment.
Was this meant to remain commented out?
There was a problem hiding this comment.
Yes, they aren't needed anymore, but I went ahead and cleaned it up
XAMPPRocky
force-pushed
the
ep/fix-cluster-watch
branch
from
1981394 to
b09d8b9
Compare
|
Build Succeeded 🥳 Build Id: 2df993a6-4d31-4b68-aab8-1e96a2c37ec6 The following development images have been built, and will exist for the next 30 days: To build this version: |
markmandel
added
kind/bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should actually fix the issue with changes not being sent across three services, and removes the constant re-checking for changes by finally fixing the issue with watching clusters. The bug was devilishly subtle, the
Watchstruct watches for changes between two values and sends if they change, howeverClusterMaphad innerArcand thus both the value being held and the value in the channel were always the same.I also added a
ReadGuardand split it intoreadandwritemethods, so that's more clear what the intent is.