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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Nov 8, 2019
Merged

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

merged 1 commit into from
Nov 8, 2019

Conversation

mattklein123
Copy link
Member

This reverts commit 443bc33.

@repokitteh-read-only
Copy link

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/.

🐱

Caused by: #8939 was opened by mattklein123.

see: more, trace.

@mattklein123
Copy link
Member Author

cc @fredlas @wgallagher @kyessenov @htuch @lizan

@mattklein123 mattklein123 mentioned this pull request Nov 7, 2019
Closed
@repokitteh-read-only repokitteh-read-only bot removed the api label Nov 7, 2019
@fredlas
Copy link
Contributor

fredlas commented Nov 7, 2019

I think it's better to fix forward than to revert, in this case. There is exactly one problem with it, and it's fixed by the easily verifiable one line change of #8935. Furthermore, this revert will reintroduce a known bug with the old code, described in #8923.

@mattklein123
Copy link
Member Author

Sorry @fredlas that's not the way we handle issues like this. We will revert and then we can resubmit the other PR once we agree on the right integration test coverage to prevent the reported issue.

@mattklein123 mattklein123 merged commit df6d3bc into master Nov 8, 2019
@mattklein123 mattklein123 deleted the revert_xds branch November 8, 2019 00:21
mattklein123 pushed a commit that referenced this pull request Nov 12, 2019
@fredlas @mattklein123
config: reinstate #8478 (unification of delta and SotW xDS), reverted…
a37522c 
… by #8939 (#8974)

Signed-off-by: Fred Douglas <[email protected]>
mattklein123 added a commit that referenced this pull request Nov 15, 2019
@mattklein123
Revert "config: minor cleanup: remove DeltaSubscriptionState::resourc…
c3f1125 
…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 mattklein123 mentioned this pull request Nov 15, 2019
Merged
mattklein123 added a commit that referenced this pull request Nov 16, 2019
@mattklein123
Revert "config: minor cleanup: remove DeltaSubscriptionState::resourc…
38adf1f 
…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]>
@sthagen sthagen mentioned this pull request Nov 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lizan lizan lizan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mattklein123 @fredlas @lizan