java-control-plane
java-control-plane copied to clipboard
Make DiscoveryServer stream ID global
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.
Codecov Report
Merging #157 (91da9e9) into master (ff834cb) will decrease coverage by
0.07%. The diff coverage is75.00%.
@@ 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
| Impacted Files | Coverage Δ | Complexity Δ | |
|---|---|---|---|
| .../envoyproxy/controlplane/server/StreamCounter.java | 66.66% <66.66%> (ø) |
2.00 <2.00> (?) |
|
| ...nvoyproxy/controlplane/server/DiscoveryServer.java | 100.00% <100.00%> (ø) |
6.00 <3.00> (ø) |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact),ø = not affected,? = missing dataPowered by Codecov. Last update ff834cb...91da9e9. Read the comment docs.
I will look at it tomorrow, if you're in a hurry then go for it.
@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.