Github user eribeiro commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/150#discussion_r96121135
--- Diff: src/java/main/org/apache/zookeeper/client/StaticHostProvider.java
---
@@ -87,12 +73,69 @@ public StaticHostProvider(Collection<InetSocketAddress>
serverAddresses)
Collections.shuffle(this.serverAddresses);
}
+ /**
+ * 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().
+ *
+ * It evaluates to a hostname if one is available and otherwise it
returns the
+ * string representation of the IP address.
+ *
+ * @param addr
+ * @return
+ */
+ private String getHostString(InetSocketAddress addr) {
+ String hostString;
+ InetAddress ia = addr.getAddress();
+
+ if ( ia != null ) {
+ // 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.indexOf( ':'
));
+ }
+
+ return hostString;
+ }
+
public int size() {
return serverAddresses.size();
}
public InetSocketAddress next(long spinDelay) {
+ // Handle possible connection error by re-resolving hostname if
possible
+ if (!connectedSinceNext) {
+ InetSocketAddress curAddr = serverAddresses.get(currentIndex);
+ if
(!curAddr.getHostString().equals(curAddr.getAddress().getHostAddress())) {
+ try {
+ int thePort = curAddr.getPort();
+ InetAddress resolvedAddresses[] =
InetAddress.getAllByName(getHostString(curAddr));
+ if (resolvedAddresses.length == 1) {
+ serverAddresses.set(currentIndex, new
InetSocketAddress(resolvedAddresses[0], thePort));
+ } else {
+ serverAddresses.remove(currentIndex);
+ for (InetAddress resolvedAddress :
resolvedAddresses) {
+ InetSocketAddress newAddr = new
InetSocketAddress(resolvedAddress, thePort);
+ if (!serverAddresses.contains(newAddr)) {
+ serverAddresses.add(newAddr);
+ }
+ }
+ }
+ } catch (UnknownHostException e) {
+ LOG.warn("Cannot re-resolve server: " + curAddr + "
UnknownHostException: " + e);
+ }
+ }
+ }
++currentIndex;
+ connectedSinceNext = false;
if (currentIndex == serverAddresses.size()) {
--- End diff --
As `serverAddresses.size()` cannot be 0 (per constructor checking) this if
condition and line 137 could be rewritten as:
``
currentIndex = currentIndex % serverAddresses.size();
``
or even
``
currentIndex = ++currentIndex % serverAddresses.size();
``
Eliminating the need of line 137 too.
On master, branch-3.4 and branch-3.5. **Just a silly optimization, tough.**
---
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.
---
