Make DiscoveryServer stream ID global #157
Open
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
smtilden
force-pushed
the
stilden/global-stream-counter
branch
from
2dddc8f
to
e8ea8ba
Compare
|
When surfacing V2 and V3 streams alongside each other in envoy-control, DiscoveryServerCallbacks are unable to differentiate between V2 & V3 ADS upon onStreamClose(), onStreamCloseWithError(). This means that any DiscoveryServerCallback that keeps state cannot pivot on stream IDs, since there will be duplicate between V2 & V3. This change creates a global StreamCounter, which ensures stream IDs will be unique across V2 & V3 streams. Signed-off-by: Stephanie Tilden <stephanietilden@squareup.com>
smtilden
force-pushed
the
stilden/global-stream-counter
branch
from
e8ea8ba
to
91da9e9
Compare
Codecov Report
@@ Coverage Diff @@
## master #157 +/- ##
============================================
- Coverage 88.22% 88.15% -0.08%
- Complexity 298 300 +2
============================================
Files 31 32 +1
Lines 977 979 +2
Branches 78 78
============================================
+ Hits 862 863 +1
- Misses 85 86 +1
Partials 30 30
Continue to review full report at Codecov.
|
baojr
reviewed
Jan 4, 2021
| @@ -21,7 +20,6 @@ | |||
| final ConfigWatcher configWatcher; | |||
| final ProtoResourcesSerializer protoResourcesSerializer; | |||
| private final ExecutorGroup executorGroup; | |||
| private final AtomicLong streamCount = new AtomicLong(); | |||
There was a problem hiding this comment.
Can you instead just make this field static?
baojr
approved these changes
Feb 17, 2021
jakubdyszkiewicz
approved these changes
Feb 21, 2021
|
I will look at it tomorrow, if you're in a hurry then go for it. |
slonka
approved these changes
Feb 22, 2021
|
@jakubdyszkiewicz do you want to release it or should I? |
|
@slonka looks like we should probably merge this? is your approval still good? |
|
@mpuncel - yeah 👍 - I just did not release it because the release process was broken at the time. If it's fixed then go ahead. |
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.
No description provided.