config: unification of delta and SotW gRPC xDS #8478
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
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
…SotW behavior Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
…empt Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
…wn PR Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
Signed-off-by: Fred Douglas <[email protected]>
|
@mattklein123 @wgallagher done! test/... passed locally for me, and it looks like the CI tests have now passed too, other than a bit of infrastructure breakage. |
|
awesome! |
mattklein123
approved these changes
Nov 6, 2019
| @@ -9,39 +9,51 @@ you can mostly forget the filesystem/REST/gRPC distinction, and you can | |||
| especially forget about the gRPC flavors. All of that is specified in the | |||
| bootstrap config, which is read and put into action by ClusterManagerImpl. | |||
|
|
|||
| Note that there can be multiple active gRPC subscriptions for a single resource | |||
There was a problem hiding this comment.
@wgallagher in a follow up change can we move this doc to source/docs where our dev docs go and/or figure out if this should be merged into the RST docs?
| @@ -9,52 +9,62 @@ | |||
| #include "common/config/delta_subscription_state.h" | |||
There was a problem hiding this comment.
@wgallagher I assume eventually we are going to rename files away from "new" if we only have a single implementation? Not sure of the history here.
There was a problem hiding this comment.
Yeah, totally. This PR keeps it as new to minimize churn, and most importantly to allow the github diffs in this PR to actually be meaningful for those files.
|
Wooo, thanks! Almost fully clean now. As you mentioned, the "new" in NewGrpcMuxImpl is temporary - I'll be sending out a PR for that shortly. |
|
I'd be happy to make the name change. Would be a good first envoy PR. |
|
Awesome, thanks, go for it! |
mattklein123
added a commit
that referenced
this pull request
Nov 7, 2019
This reverts commit 443bc33. Signed-off-by: Matt Klein <[email protected]>
mattklein123
added a commit
that referenced
this pull request
Nov 8, 2019
This reverts commit 443bc33. Signed-off-by: Matt Klein <[email protected]>
mattklein123
pushed a commit
that referenced
this pull request
Nov 12, 2019
… by #8939 (#8974) Signed-off-by: Fred Douglas <[email protected]>
mattklein123
added a commit
that referenced
this pull request
Nov 15, 2019
…e_names_ (#8918)" This reverts commit 80aedc1. Revert "config: rename NewGrpcMuxImpl -> GrpcMuxImpl (#8919)" This reverts commit 6d50553. Revert "config: reinstate #8478 (unification of delta and SotW xDS), reverted by #8939 (#8974)" This reverts commit a37522c. Signed-off-by: Matt Klein <[email protected]>
mattklein123
added a commit
that referenced
this pull request
Nov 16, 2019
…e_names_ (#8918)" (#9044) This reverts commit 80aedc1. Revert "config: rename NewGrpcMuxImpl -> GrpcMuxImpl (#8919)" This reverts commit 6d50553. Revert "config: reinstate #8478 (unification of delta and SotW xDS), reverted by #8939 (#8974)" This reverts commit a37522c. Signed-off-by: Matt Klein <[email protected]>
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.
Delta and state-of-the-world gRPC xDS now share the same GrpcMux and
Subscription implementations. These are the implementations added in #7293 for
delta. These implementations are a rewrite/extensive refactoring of the old
GrpcMuxImpl (deleted by this PR) and associated logic.
Risk Level: high (rewrite/large refactor of gRPC xDS)
Testing: added sotw_subscription_state_test