xds: add end-2-end test with java control plane #8715
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
ejona86
reviewed
Dec 1, 2021
ejona86
reviewed
Jan 20, 2022
| new Thread.UncaughtExceptionHandler() { | ||
| @Override | ||
| public void uncaughtException(Thread t, Throwable e) { | ||
| logger.log(Level.SEVERE, "Exception!" + e); |
There was a problem hiding this comment.
For tests, you may consider throw new AssertionError(e).
There was a problem hiding this comment.
Don't log+throw. So remove the log.
| static final String ADS_TYPE_URL_EDS = | ||
| "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment"; | ||
|
|
||
| private final Map<String, HashMap<String, Object>> xdsResources = new HashMap<>(); |
There was a problem hiding this comment.
You don't have to change it, but I'll just note that for clarity this looks like an ideal case to use row-based instead of column-based data structure. So instead of these 4 fields, you'd have:
final Map<String, ResourceType> resourceTypes = new HashMap<>();
final class ResourceType {
Map<String, Object> resources;
final Map<StreamObserver<DiscoveryResponse>, List<String>> subscribers;
final AtomicInteger version;
final AtomicInteger nonce;
}
That should make the rest of the code more clear and also gives you a convenient place to put methods if you want something specialized for managing the atomics, etc.
ejona86
reviewed
Feb 7, 2022
xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsIntegrationTest.java
Outdated
Show resolved
Hide resolved
ejona86
reviewed
Feb 17, 2022
xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsIntegrationTest.java
Outdated
Show resolved
Hide resolved
ejona86
approved these changes
Feb 25, 2022
| new Thread.UncaughtExceptionHandler() { | ||
| @Override | ||
| public void uncaughtException(Thread t, Throwable e) { | ||
| logger.log(Level.SEVERE, "Exception!" + e); |
There was a problem hiding this comment.
Don't log+throw. So remove the log.
xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsIntegrationTest.java
Outdated
Show resolved
Hide resolved
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.
Moving #8618 to xds package, because it seems a better destination.
Previously reverted due to wrongly using shaded dependency that breaks google3: #8656
cc. @dapengzhang0
Latest structure:
added a java control plane for xds tests end-to-end.
The FakeControlPlaneService manages full sets of xds resources. Use
setXdsConfig()method to update the latest xds configurations; the method can be called anytime and multiple times dynamically. The fake control plane allows multiple clients connecting, delivers xds responses(for the data resources, or ACK/NACK) for the xds client requests.The
FakeControlPlaneXdsIntegrationTestonly has one pingPong test case now. Other test case can be added in a similar way.