Fix reconnecting after ArangoDB restarts (issue #186)

Author: mpv1989

ChangeLog

@@ -1,8 +1,9 @@
 v4.3.8 (2018-xx-xx)
 ---------------------------
 
-* Changed dependency com.arangodb:velocypack to 1.0.15
+* changed dependency com.arangodb:velocypack to 1.0.15
  * fixed DateUtil does incorrect conversion of UTC time
+* fixed reconnecting after ArangoDB restarts (issue #186)
 
 v4.3.7 (2018-04-17)
 ---------------------------

src/main/java/com/arangodb/internal/http/HttpConnection.java

@@ -191,6 +191,7 @@ public Response execute(final Request request) throws ArangoDBException, IOExcep
 host = hostHandler.get();
 while (true) {
 if (host == null) {
+hostHandler.reset();
 throw new ArangoDBException("Was not able to connect to any host");
 }
 try {

src/main/java/com/arangodb/internal/net/DelHostHandler.java

@@ -58,4 +58,10 @@ public void fail() {
 }
 }
 
+@Override
+public void reset() {
+host = null;
+hostHandler.reset();
+}
+
 }

src/main/java/com/arangodb/internal/net/FallbackHostHandler.java

@@ -62,4 +62,9 @@ public void fail() {
 }
 }
 
+@Override
+public void reset() {
+iterations = 0;
+}
+
 }

src/main/java/com/arangodb/internal/net/HostHandler.java

@@ -34,4 +34,6 @@ public interface HostHandler {
 
 void fail();
 
+void reset();
+
 }

src/main/java/com/arangodb/internal/net/RandomHostHandler.java

@@ -68,4 +68,9 @@ private Host getRandomHost(final boolean initial, final boolean closeConnections
 return hosts.get(0);
 }
 
+@Override
+public void reset() {
+fallback.reset();
+}
+
 }

src/main/java/com/arangodb/internal/net/RoundRobinHostHandler.java

@@ -62,4 +62,9 @@ public void fail() {
 fails++;
 }
 
+@Override
+public void reset() {
+fails = 0;
+}
+
 }

src/main/java/com/arangodb/internal/velocystream/internal/VstConnection.java

@@ -103,6 +103,7 @@ public synchronized void open() throws IOException {
 host = hostHandler.get();
 while (true) {
 if (host == null) {
+hostHandler.reset();
 throw new ArangoDBException("Was not able to connect to any host");
 }
 if (LOGGER.isDebugEnabled()) {
@@ -160,7 +161,7 @@ public Void call() throws Exception {
 while (true) {
 if (ttlTime != null && new Date().getTime() > ttlTime && messageStore.isEmpty()) {
 close();
-hostHandler.fail();
+hostHandler.reset();
 break;
 }
 if (!isOpen()) {