config: unification of delta and SotW gRPC xDS by fredlas · Pull Request #8478 · envoyproxy/envoy

fredlas · 2019-10-03T20:15:42Z

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

Signed-off-by: Fred Douglas <fredlas@google.com>

…SotW behavior Signed-off-by: Fred Douglas <fredlas@google.com>

Signed-off-by: Fred Douglas <fredlas@google.com>

…empt Signed-off-by: Fred Douglas <fredlas@google.com>

Signed-off-by: Fred Douglas <fredlas@google.com>

…wn PR Signed-off-by: Fred Douglas <fredlas@google.com>

Signed-off-by: Fred Douglas <fredlas@google.com>

fredlas · 2019-11-06T16:38:38Z

@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.

wgallagher · 2019-11-06T17:07:05Z

awesome!

mattklein123

Thanks!

mattklein123 · 2019-11-06T18:23:32Z

source/common/config/README.md

 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


@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?

mattklein123 · 2019-11-06T18:25:19Z

source/common/config/new_grpc_mux_impl.h

@@ -9,52 +9,62 @@
 #include "common/config/delta_subscription_state.h"


@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.

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.

fredlas · 2019-11-06T19:13:45Z

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.

wgallagher · 2019-11-06T19:30:29Z

I'd be happy to make the name change. Would be a good first envoy PR.

fredlas · 2019-11-06T19:50:23Z

Awesome, thanks, go for it!

This reverts commit 443bc33. Signed-off-by: Matt Klein <mklein@lyft.com>

… by #8939 (#8974) Signed-off-by: Fred Douglas <fredlas@google.com>

…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 <mklein@lyft.com>

…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 <mklein@lyft.com>

fredlas added 30 commits September 12, 2019 17:33

initial totally broken mid-merge commit

8798a7b

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

10b91ec

Signed-off-by: Fred Douglas <fredlas@google.com>

xds sotw and delta unification almost entirely compiling

2a2d53d

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

7f9c324

Signed-off-by: Fred Douglas <fredlas@google.com>

much of ads_integration_test passes, support skip_subsequent_node

0a8d087

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

f351797

Signed-off-by: Fred Douglas <fredlas@google.com>

incorporate PR 7427 init timeout disable

2b5109c

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

42186ec

Signed-off-by: Fred Douglas <fredlas@google.com>

WatchMap changes from PR 8350

282d346

Signed-off-by: Fred Douglas <fredlas@google.com>

PR 8334

bce3da0

Signed-off-by: Fred Douglas <fredlas@google.com>

add to the mock gRPC version of the protobuf matchers

df64fc9

Signed-off-by: Fred Douglas <fredlas@google.com>

all config unit tests pass, found some moderate differences from old …

9d79ab8

…SotW behavior Signed-off-by: Fred Douglas <fredlas@google.com>

merge conflict

9392d0b

Signed-off-by: Fred Douglas <fredlas@google.com>

passes scoped_rds and vhds with stat commented out

4cf6dab

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

28f5983

Signed-off-by: Fred Douglas <fredlas@google.com>

reenable segfaulting stat access, reshuffle onConfigUpdate update_att…

676d467

…empt Signed-off-by: Fred Douglas <fredlas@google.com>

merge conflict

5e99a08

Signed-off-by: Fred Douglas <fredlas@google.com>

make the update_attempt_ TODOs actual TODOs, since it should be its o…

7398569

…wn PR Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

75c8ed4

Signed-off-by: Fred Douglas <fredlas@google.com>

initial rough merge of the now-in-master 7293

19f990f

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

f51d3c2

Signed-off-by: Fred Douglas <fredlas@google.com>

get github to diff grpc_mux_impl against new_grpc_mux impl, part 1

4f7b1e7

Signed-off-by: Fred Douglas <fredlas@google.com>

get github to diff grpc_mux_impl against new_grpc_mux impl, part 2

52c798e

Signed-off-by: Fred Douglas <fredlas@google.com>

get github to diff grpc_mux_impl against new_grpc_mux impl, part 3

96ce9f0

Signed-off-by: Fred Douglas <fredlas@google.com>

is_delta removed from everywhere, new sotw_sub_state_test passes

7d0904e

Signed-off-by: Fred Douglas <fredlas@google.com>

Merge remote-tracking branch 'upstream/master' into unified_ADS

4ea4ef3

Signed-off-by: Fred Douglas <fredlas@google.com>

everything passes except integration framework lifetimes bug

0e9a90d

Signed-off-by: Fred Douglas <fredlas@google.com>

merge conflict

979dfcd

Signed-off-by: Fred Douglas <fredlas@google.com>

GrpcMuxImpl back to NewGrpcMuxImpl for cleaner diff

c8d159f

Signed-off-by: Fred Douglas <fredlas@google.com>

rename class GrpcMuxImpl to NewGrpcMuxImpl

fdb501c

Signed-off-by: Fred Douglas <fredlas@google.com>

repokitteh-read-only bot added the waiting label Nov 1, 2019

resolve merge

25f6163

Signed-off-by: Fred Douglas <fredlas@google.com>

repokitteh-read-only bot removed the waiting label Nov 5, 2019

mattklein123 approved these changes Nov 6, 2019

View reviewed changes

repokitteh-read-only bot removed the api label Nov 6, 2019

mattklein123 merged commit 443bc33 into envoyproxy:master Nov 6, 2019

mattklein123 added a commit that referenced this pull request Nov 7, 2019

Revert "config: unification of delta and SotW gRPC xDS (#8478)"

e4eda77

This reverts commit 443bc33. Signed-off-by: Matt Klein <mklein@lyft.com>

mattklein123 added a commit that referenced this pull request Nov 8, 2019

Revert "config: unification of delta and SotW gRPC xDS (#8478)" (#8939)

df6d3bc

This reverts commit 443bc33. Signed-off-by: Matt Klein <mklein@lyft.com>

fredlas mentioned this pull request Nov 11, 2019

config: reinstate #8478 (unification of delta and SotW xDS), reverted by #8939 #8974

Merged

mattklein123 pushed a commit that referenced this pull request Nov 12, 2019

config: reinstate #8478 (unification of delta and SotW xDS), reverted…

a37522c

… by #8939 (#8974) Signed-off-by: Fred Douglas <fredlas@google.com>

mattklein123 mentioned this pull request Nov 15, 2019

xds: revert delta/SoTW changes #9044

Merged

sthagen mentioned this pull request Nov 17, 2019

Revert "config: minor cleanup: remove DeltaSubscriptionState::resourc… sthagen/envoyproxy-envoy#62

Merged

fredlas mentioned this pull request Dec 2, 2019

xds: undo the revert (#9044) of delta+SotW unification #9189

Closed

fredlas mentioned this pull request Dec 17, 2019

On-demand VHDS implementation #8617

Merged

fredlas mentioned this pull request Mar 9, 2020

set_node_on_first_message_only seems to never set node ID #9682

Closed

tbarrella mentioned this pull request Dec 7, 2020

integration tests: re-enable set_node_on_first_message_only #14270

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

config: unification of delta and SotW gRPC xDS#8478

config: unification of delta and SotW gRPC xDS#8478
mattklein123 merged 66 commits intoenvoyproxy:masterfrom
fredlas:unified_ADS

fredlas commented Oct 3, 2019 •

edited

Loading

Uh oh!

fredlas commented Nov 6, 2019

Uh oh!

wgallagher commented Nov 6, 2019

Uh oh!

mattklein123 left a comment

Uh oh!

mattklein123 Nov 6, 2019

Uh oh!

mattklein123 Nov 6, 2019

Uh oh!

fredlas Nov 6, 2019

Uh oh!

fredlas commented Nov 6, 2019

Uh oh!

wgallagher commented Nov 6, 2019

Uh oh!

fredlas commented Nov 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		@@ -9,52 +9,62 @@
		#include "common/config/delta_subscription_state.h"

Conversation

fredlas commented Oct 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fredlas commented Nov 6, 2019

Uh oh!

wgallagher commented Nov 6, 2019

Uh oh!

mattklein123 left a comment

Choose a reason for hiding this comment

Uh oh!

mattklein123 Nov 6, 2019

Choose a reason for hiding this comment

Uh oh!

mattklein123 Nov 6, 2019

Choose a reason for hiding this comment

Uh oh!

fredlas Nov 6, 2019

Choose a reason for hiding this comment

Uh oh!

fredlas commented Nov 6, 2019

Uh oh!

wgallagher commented Nov 6, 2019

Uh oh!

fredlas commented Nov 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fredlas commented Oct 3, 2019 •

edited

Loading