xds: handle 100% drop for fallback mode #5784
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
Member
dapengzhang0
commented
May 23, 2019
dapengzhang0
commented
- Cancel fallback timer and/or exit fallback mode once receiving an EDS response indicating 100% drop.
- Also update balancing state once receiving the first EDS response with drop information when the channel is at the initial IDLE state.
…andle-drop-for-fallback
zhangkun83
reviewed
May 24, 2019
| @@ -285,6 +285,9 @@ private void updatePicker(ConnectivityState state, List<WeightedChildPicker> ch | |||
|
|
|||
| if (!dropOverloads.isEmpty()) { | |||
| picker = new DroppablePicker(dropOverloads, picker, random); | |||
| if (state == null) { | |||
There was a problem hiding this comment.
Should probably add a @Nullable to the state argument
| @@ -274,8 +278,17 @@ public PickResult pickSubchannel(PickSubchannelArgs args) { | |||
| verify(random, never()).nextInt(1000_000); | |||
| } | |||
|
|
|||
| @Test | |||
| public void updateLoaclityStore_withEmptyDropList() { | |||
| localityStore.updateDropPercentage(ImmutableList.<DropOverload>of()); | |||
There was a problem hiding this comment.
Isn't empty list the default value already? Should updateLoaclityStore() be renamed to updateLoaclityStore_withEmptyDropList()?
| verify(localityStore, times(2)).updateLocalityStore(localityEndpointsMappingCaptor.capture()); | ||
| verify(adsStreamCallback, times(1)).onWorking(); | ||
| verify(adsStreamCallback, never()).onAllDrop(); | ||
| verify(adsStreamCallback, never()).onError(); |
There was a problem hiding this comment.
Can the above two lines be replaced by verifyNoMoreInteractions()? (Ditto for the same cases below)
zhangkun83
approved these changes
May 24, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.