Github user eribeiro commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/150#discussion_r98280911
--- Diff: src/java/main/org/apache/zookeeper/client/StaticHostProvider.java
---
@@ -87,15 +75,104 @@ public
StaticHostProvider(Collection<InetSocketAddress> serverAddresses)
Collections.shuffle(this.serverAddresses);
}
+ /**
+ * Evaluate to a hostname if one is available and otherwise it returns
the
+ * string representation of the IP address.
+ *
+ * In Java 7, we have a method getHostString, but earlier versions do
not support it.
+ * This method is to provide a replacement for
InetSocketAddress.getHostString().
+ *
+ * @param addr
+ * @return Hostname string of address parameter
+ */
+ private String getHostString(InetSocketAddress addr) {
+ String hostString = "";
+
+ if(addr == null) {
+ return hostString;
+ }
+ if (!addr.isUnresolved()) {
+ InetAddress ia = addr.getAddress();
+
+ // If the string starts with '/', then it has no hostname
+ // and we want to avoid the reverse lookup, so we return
+ // the string representation of the address.
+ if (ia.toString().startsWith("/")) {
+ hostString = ia.getHostAddress();
+ } else {
+ hostString = addr.getHostName();
+ }
+ } else {
+ // According to the Java 6 documentation, if the hostname is
+ // unresolved, then the string before the colon is the
hostname.
+ String addrString = addr.toString();
+ hostString = addrString.substring(0,
addrString.lastIndexOf(':'));
+ }
+
+ return hostString;
+ }
+
public int size() {
return serverAddresses.size();
}
+ // Counts the number of addresses added and removed during
+ // the last call to next. Used mainly for test purposes.
+ // See StasticHostProviderTest.
+ private int nextAdded = 0;
+ private int nextRemoved = 0;
+
+ public int getNextAdded() {
+ return nextAdded;
+ }
+
+ public int getNextRemoved() {
+ return nextRemoved;
+ }
+
public InetSocketAddress next(long spinDelay) {
- ++currentIndex;
- if (currentIndex == serverAddresses.size()) {
- currentIndex = 0;
+ // Handle possible connection error by re-resolving hostname if
possible
+ if (!connectedSinceNext) {
+ InetSocketAddress curAddr = serverAddresses.get(currentIndex);
+ if
(!getHostString(curAddr).equals(curAddr.getAddress().getHostAddress())) {
+ LOG.info("Resolving again hostname: {}",
getHostString(curAddr));
+ try {
+ int thePort = curAddr.getPort();
+ InetAddress resolvedAddresses[] =
InetAddress.getAllByName(getHostString(curAddr));
+ nextAdded = 0;
+ nextRemoved = 0;
+ if (resolvedAddresses.length == 1) {
+ serverAddresses.set(currentIndex, new
InetSocketAddress(resolvedAddresses[0], thePort));
+ nextAdded = nextRemoved = 1;
+ LOG.debug("Newly resolved address: {}",
resolvedAddresses[0]);
+ } else {
+ int i = 0;
+ while(i < serverAddresses.size()) {
+ if(getHostString(serverAddresses.get(i)) ==
getHostString(curAddr)) {
--- End diff --
Why call `getHostString(curAddr)` (here in a loop, at line 137, 138, 141)
if the `currAddr` doesn't change? Better call once between line 136 and 137 and
assign to a variable, no?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
