Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eureka Client doesn't respect DNS server change at runtime #1157

Merged
merged 3 commits into from
Dec 18, 2018
Merged

Eureka Client doesn't respect DNS server change at runtime #1157

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b11040
initialize DirContext on each request to DNS (make DirContext non-sta…
krutsko Nov 14, 2018
755d5a8
fix exception handling
krutsko Nov 16, 2018
d6ba8c1
revert to static DNSResolver
krutsko Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions eureka-client/src/main/java/com/netflix/discovery/endpoint/DnsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public final class DnsResolver {
private static final String CNAME_RECORD_TYPE = "CNAME";
private static final String TXT_RECORD_TYPE = "TXT";

static final DirContext dirContext = getDirContext();

private DnsResolver() {
}

Expand Down Expand Up @@ -66,7 +64,7 @@ public static String resolve(String originalHost) {
try {
String targetHost = null;
do {
Attributes attrs = dirContext.getAttributes(currentHost, new String[]{A_RECORD_TYPE, CNAME_RECORD_TYPE});
Attributes attrs = getDirContext().getAttributes(currentHost, new String[]{A_RECORD_TYPE, CNAME_RECORD_TYPE});
Attribute attr = attrs.get(A_RECORD_TYPE);
if (attr != null) {
targetHost = attr.get().toString();
Expand Down Expand Up @@ -97,7 +95,7 @@ public static List<String> resolveARecord(String rootDomainName) {
return null;
}
try {
Attributes attrs = dirContext.getAttributes(rootDomainName, new String[]{A_RECORD_TYPE, CNAME_RECORD_TYPE});
Attributes attrs = getDirContext().getAttributes(rootDomainName, new String[]{A_RECORD_TYPE, CNAME_RECORD_TYPE});
Attribute aRecord = attrs.get(A_RECORD_TYPE);
Attribute cRecord = attrs.get(CNAME_RECORD_TYPE);
if (aRecord != null && cRecord == null) {
Expand Down Expand Up @@ -129,7 +127,7 @@ private static boolean isLocalOrIp(String currentHost) {
* Looks up the DNS name provided in the JNDI context.
*/
public static Set<String> getCNamesFromTxtRecord(String discoveryDnsName) throws NamingException {
Attributes attrs = dirContext.getAttributes(discoveryDnsName, new String[]{TXT_RECORD_TYPE});
Attributes attrs = getDirContext().getAttributes(discoveryDnsName, new String[]{TXT_RECORD_TYPE});
Attribute attr = attrs.get(TXT_RECORD_TYPE);
String txtRecord = null;
if (attr != null) {
Expand Down