Add Resolver interface and implementations #332
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
|
I think this might be a little overzealous in replacing all found calls to InetAddress in core module, I'll probably revert codecs, clients etc. to direct calls. For our use case it's probably most important to plug it in |
dkropachev
requested changes
Aug 28, 2024
core/src/main/java/com/datastax/dse/driver/internal/core/insights/InsightsClient.java
Outdated
Show resolved
Hide resolved
dkropachev
reviewed
Aug 28, 2024
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/MockResolver.java
Outdated
Show resolved
Hide resolved
Bouncheck
force-pushed
the
scylla-4.x-resolver-class
branch
from
62904d3
to
a4118a3
Compare
dkropachev
requested changes
Aug 28, 2024
integration-tests/src/test/java/com/datastax/oss/driver/core/cql/SecondTraceIT.java
Outdated
Show resolved
Hide resolved
integration-tests/src/test/java/com/datastax/oss/driver/core/cql/SecondTraceIT.java
Outdated
Show resolved
Hide resolved
integration-tests/src/test/java/com/datastax/oss/driver/core/cql/SecondTraceIT.java
Outdated
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/MockResolver.java
Outdated
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/MockResolverFactory.java
Outdated
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/MockResolverResultSource.java
Outdated
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/UnknownHostResponse.java
Outdated
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/ValidResponse.java
Outdated
Show resolved
Hide resolved
core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryTestBase.java
Outdated
Show resolved
Hide resolved
...rc/test/java/com/datastax/oss/driver/internal/core/resolver/MockResolverTestImplFactory.java
Outdated
Show resolved
Hide resolved
Adds tiny utility method to CcmBridge.
Bouncheck
force-pushed
the
scylla-4.x-resolver-class
branch
6 times, most recently
from
a7f8918
to
8fc4afa
Compare
dkropachev
requested changes
Aug 30, 2024
| "node-1.cluster.fake", | ||
| new ValidResponse(new InetAddress[] {getNodeInetAddress(ccmBridge, 1)})); | ||
| MockResolverFactory resolverFactory = new MockResolverFactory(); | ||
| resolverFactory.addResponses(map); |
...in/java/com/datastax/oss/driver/internal/core/resolver/mockResolver/MockResolverFactory.java
Outdated
Show resolved
Hide resolved
...in/java/com/datastax/oss/driver/internal/core/resolver/mockResolver/MockResolverFactory.java
Outdated
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/Resolver.java
Show resolved
Hide resolved
core/src/main/java/com/datastax/oss/driver/internal/core/resolver/AbstractResolverFactory.java
Outdated
Show resolved
Hide resolved
.../src/main/java/com/datastax/oss/driver/internal/core/resolver/mockResolver/MockResolver.java
Outdated
Show resolved
Hide resolved
.../src/main/java/com/datastax/oss/driver/internal/core/resolver/mockResolver/MockResolver.java
Outdated
Show resolved
Hide resolved
integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java
Show resolved
Hide resolved
.../src/main/java/com/datastax/oss/driver/internal/core/resolver/mockResolver/MockResolver.java
Outdated
Show resolved
Hide resolved
...in/java/com/datastax/oss/driver/internal/core/resolver/mockResolver/MockResolverFactory.java
Outdated
Show resolved
Hide resolved
Bouncheck
force-pushed
the
scylla-4.x-resolver-class
branch
from
8fc4afa
to
a2eb2cb
Compare
|
Applied all suggestions with minor fixes. |
Bouncheck
force-pushed
the
scylla-4.x-resolver-class
branch
from
a2eb2cb
to
ae252e0
Compare
|
Changed logic of checking for "unresolvedness". Turns out Java 8 has different toString implementation than the version I used. |
Adds a middleman between driver and all direct calls to InetAddress. This is meant to help with testing in case there is a need to substitute name resolution with resolution by specific ip address without modifying system environment or providing custom DNS server. Default implementation redirects all calls to InetAddress class which should not introduce change in behaviour. One introduced downside is that if the methods are to be customizable then the interface cannot have them `static`. Adds also implementation of MockResolver that has its own mapping of hostnames to addresses. Adds MockResolverIT.
Bouncheck
force-pushed
the
scylla-4.x-resolver-class
branch
from
ae252e0
to
ee82cf3
Compare
dkropachev
approved these changes
Aug 31, 2024
dkropachev
approved these changes
Aug 31, 2024
There was a problem hiding this comment.
@Bouncheck , thanks, great job, it looks amazing and we going to get a lot out of it.
This was referenced Aug 31, 2024
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.
Requested modification to allow for more control over hostname resolution when testing.
Adds a set of Resolver classes and factories and hooks them into necessary places.
See commit messages and javadoc for more details.