grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: add jndi timeout and dirContext.close

This commit is contained in:
ZHANG Dapeng 2018-07-02 17:36:05 -07:00 committed by GitHub
parent e3ff1ade07
commit 6dad047126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java
View File

@ -29,6 +29,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -108,7 +109,7 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol
Level.FINER, "About to query TXT records for {0}", new Object[]{serviceConfigHostname}); Level.FINER, "About to query TXT records for {0}", new Object[]{serviceConfigHostname});
} }
List<String> serviceConfigRawTxtRecords = List<String> serviceConfigRawTxtRecords =
getAllRecords(new InitialDirContext(), "TXT", "dns:///" + serviceConfigHostname); getAllRecords("TXT", "dns:///" + serviceConfigHostname);
if (logger.isLoggable(Level.FINER)) { if (logger.isLoggable(Level.FINER)) {
logger.log( logger.log(
Level.FINER, "Found {0} TXT records", new Object[]{serviceConfigRawTxtRecords.size()}); Level.FINER, "Found {0} TXT records", new Object[]{serviceConfigRawTxtRecords.size()});
@ -130,7 +131,7 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol
Level.FINER, "About to query SRV records for {0}", new Object[]{grpclbHostname}); Level.FINER, "About to query SRV records for {0}", new Object[]{grpclbHostname});
} }
List<String> grpclbSrvRecords = List<String> grpclbSrvRecords =
getAllRecords(new InitialDirContext(), "SRV", "dns:///" + grpclbHostname); getAllRecords("SRV", "dns:///" + grpclbHostname);
if (logger.isLoggable(Level.FINER)) { if (logger.isLoggable(Level.FINER)) {
logger.log( logger.log(
Level.FINER, "Found {0} SRV records", new Object[]{grpclbSrvRecords.size()}); Level.FINER, "Found {0} SRV records", new Object[]{grpclbSrvRecords.size()});
@ -193,32 +194,66 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol
return new SrvRecord(parts[3], Integer.parseInt(parts[2])); return new SrvRecord(parts[3], Integer.parseInt(parts[2]));
} }
private static List<String> getAllRecords( private static List<String> getAllRecords(String recordType, String name)
DirContext dirContext, String recordType, String name) throws NamingException { throws NamingException {
String[] rrType = new String[]{recordType}; String[] rrType = new String[]{recordType};
javax.naming.directory.Attributes attrs = dirContext.getAttributes(name, rrType);
List<String> records = new ArrayList<String>(); List<String> records = new ArrayList<String>();
NamingEnumeration<? extends Attribute> rrGroups = attrs.getAll(); @SuppressWarnings("JdkObsolete")
Hashtable<String, String> env = new Hashtable<String, String>();
env.put("com.sun.jndi.ldap.connect.timeout", "5000");
env.put("com.sun.jndi.ldap.read.timeout", "5000");
DirContext dirContext = new InitialDirContext(env);
try { try {
while (rrGroups.hasMore()) { javax.naming.directory.Attributes attrs = dirContext.getAttributes(name, rrType);
Attribute rrEntry = rrGroups.next(); NamingEnumeration<? extends Attribute> rrGroups = attrs.getAll();
assert Arrays.asList(rrType).contains(rrEntry.getID());
NamingEnumeration<?> rrValues = rrEntry.getAll(); try {
try { while (rrGroups.hasMore()) {
while (rrValues.hasMore()) { Attribute rrEntry = rrGroups.next();
records.add(String.valueOf(rrValues.next())); assert Arrays.asList(rrType).contains(rrEntry.getID());
NamingEnumeration<?> rrValues = rrEntry.getAll();
try {
while (rrValues.hasMore()) {
records.add(String.valueOf(rrValues.next()));
}
} catch (NamingException ne) {
closeThenThrow(rrValues, ne);
} }
} finally {
rrValues.close(); rrValues.close();
} }
} catch (NamingException ne) {
closeThenThrow(rrGroups, ne);
} }
} finally {
rrGroups.close(); rrGroups.close();
} catch (NamingException ne) {
closeThenThrow(dirContext, ne);
} }
dirContext.close();
return records; return records;
} }
private static void closeThenThrow(NamingEnumeration<?> namingEnumeration, NamingException e)
throws NamingException {
try {
namingEnumeration.close();
} catch (NamingException ignored) {
// ignore
}
throw e;
}
private static void closeThenThrow(DirContext ctx, NamingException e) throws NamingException {
try {
ctx.close();
} catch (NamingException ignored) {
// ignore
}
throw e;
}
/** /**
* Undo the quoting done in {@link com.sun.jndi.dns.ResourceRecord#decodeTxt}. * Undo the quoting done in {@link com.sun.jndi.dns.ResourceRecord#decodeTxt}.
*/ */