Skip to content

config: WatchMap: match old GrpcMuxImpl's state-of-the-world behavior#8350

Merged
htuch merged 11 commits intoenvoyproxy:masterfrom
fredlas:WAT_sotw_watch_fixes
Sep 26, 2019
Merged

config: WatchMap: match old GrpcMuxImpl's state-of-the-world behavior#8350
htuch merged 11 commits intoenvoyproxy:masterfrom
fredlas:WAT_sotw_watch_fixes

Conversation

@fredlas
Copy link
Contributor

@fredlas fredlas commented Sep 24, 2019

In bringing my draft of the delta+SotW xDS unification to a state of compiling+passing tests, I found that WatchMap's SotW handling was missing some special case logic that exists in the existing/old GrpcMuxImpl. Specifically, eliding onConfigUpdate when it would be an "update" from empty to empty, and rejecting a (non-empty) SotW update when the type URL has no watches whatsoever.
Added the eliding, but we decided the rejection is unnecessary; WatchMap will still not do it.

Risk Level: low
Testing: updated watch_map_test

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

@htuch htuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, appreciate the fix, just one major comment.

Signed-off-by: Fred Douglas <fredlas@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
@fredlas
Copy link
Contributor Author

fredlas commented Sep 26, 2019

/retest

@repokitteh-read-only
Copy link

🤷‍♀️ nothing to rebuild.

🐱

Caused by: a #8350 (comment) was created by @fredlas.

see: more, trace.

Signed-off-by: Fred Douglas <fredlas@google.com>
@lambdai
Copy link
Contributor

lambdai commented Sep 26, 2019

/lgtm

@fredlas
Copy link
Contributor Author

fredlas commented Sep 26, 2019

@htuch ready to merge, I believe

Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@htuch htuch merged commit 60707bd into envoyproxy:master Sep 26, 2019
danzh2010 pushed a commit to danzh2010/envoy that referenced this pull request Oct 4, 2019
…envoyproxy#8350)

In bringing my draft of the delta+SotW xDS unification to a state of compiling+passing tests, I found that WatchMap's SotW handling was missing some special case logic that exists in the existing/old GrpcMuxImpl. Specifically, eliding onConfigUpdate when it would be an "update" from empty to empty, and rejecting a (non-empty) SotW update when the type URL has no watches whatsoever.
Added the eliding, but we decided the rejection is unnecessary; WatchMap will still not do it.

Risk Level: low
Testing: updated watch_map_test

Signed-off-by: Fred Douglas <fredlas@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants