Merge pull request #278 from EventStore/yoeight/fix-connection-fail-loop

Fix connection service skipping discovery interval sleeps.

Author: YoEight

db-client-java/src/main/java/com/eventstore/dbclient/ConnectionService.java

@@ -127,6 +127,13 @@ public void createChannel(UUID previousId, InetSocketAddress candidate) {
                 try {
                     // TODO - Should we consider a discovery timeout?
                     this.discovery.run(this.connection).get();
+
+                    if (this.loadServerFeatures()) {
+                        this.channelId = UUID.randomUUID();
+                        this.connection.confirmChannel();
+                        logger.info("Connection to endpoint [{}] created successfully", this.connection.getLastConnectedEndpoint());
+                        break;
+                    }
                 } catch (InterruptedException e) {
                     forceExit(e);
                 } catch (ExecutionException e) {
@@ -135,17 +142,9 @@ public void createChannel(UUID previousId, InetSocketAddress candidate) {
                     // that has failed. It's possible that node might still be the best candidate if it manages to
                     // recover in the meantime.
                     this.connection.clear();
-                    continue;
                 }
             }
 
-            if (this.loadServerFeatures()) {
-                this.channelId = UUID.randomUUID();
-                this.connection.confirmChannel();
-                logger.info("Connection to endpoint [{}] created successfully", this.connection.getLastConnectedEndpoint());
-                break;
-            }
-
             // In case a candidate was provided, but we failed to connect to it.
             // We force a new discovery process in that case.
             candidate = null;