Added exponential backoff for handling connection errors

finos · Sep 6, 2019 · 3eed78a · 3eed78a
1 parent 37b7f1a
commit 3eed78a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/main/java/clients/symphony/api/DatafeedClient.java b/src/main/java/clients/symphony/api/DatafeedClient.java
@@ -22,23 +22,23 @@ public final class DatafeedClient extends APIClient {
     private final Logger logger = LoggerFactory.getLogger(DatafeedClient.class);
     private SymBotClient botClient;
     private SymConfig config;
+    private static String agentTarget;
 
     public DatafeedClient(SymBotClient client) {
         this.botClient = client;
         this.config = client.getConfig();
+        agentTarget = CommonConstants.HTTPS_PREFIX + config.getAgentHost() + ":" + config.getAgentPort();
     }
 
     public String createDatafeed() throws SymClientException {
         Response response = null;
         StringId datafeedId = null;
         try {
             logger.info("Creating new datafeed for bot {} .....", botClient.getBotUserInfo().getUsername());
-            response = botClient.getAgentClient().target(CommonConstants.HTTPS_PREFIX
-                + config.getAgentHost() + ":" + config.getAgentPort())
+            response = botClient.getAgentClient().target(agentTarget)
                 .path(AgentConstants.CREATEDATAFEED)
                 .request(MediaType.APPLICATION_JSON)
-                .header("sessionToken",
-                    botClient.getSymAuth().getSessionToken())
+                .header("sessionToken", botClient.getSymAuth().getSessionToken())
                 .header("keyManagerToken", botClient.getSymAuth().getKmToken())
                 .post(null);
             if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
@@ -61,16 +61,12 @@ public String createDatafeed() throws SymClientException {
         }
     }
 
-    public List<DatafeedEvent> readDatafeed(String id)
-            throws SymClientException {
+    public List<DatafeedEvent> readDatafeed(String id) throws SymClientException {
         List<DatafeedEvent> datafeedEvents = null;
         Response response = null;
         logger.debug("Reading datafeed {}", id);
         try {
-            WebTarget webTarget = botClient.getAgentClient().target(
-                CommonConstants.HTTPS_PREFIX
-                    + config.getAgentHost()
-                    + ":" + config.getAgentPort());
+            WebTarget webTarget = botClient.getAgentClient().target(agentTarget);
             response = webTarget
                 .path(AgentConstants.READDATAFEED.replace("{id}", id))
                 .request(MediaType.APPLICATION_JSON)

diff --git a/src/main/java/services/DatafeedEventsService.java b/src/main/java/services/DatafeedEventsService.java
@@ -42,12 +42,12 @@ public DatafeedEventsService(SymBotClient client) {
 
         int threadPoolSize = client.getConfig().getDatafeedEventsThreadpoolSize();
         THREADPOOL_SIZE = threadPoolSize > 0 ? threadPoolSize : 5;
-        int errorTimeout = client.getConfig().getDatafeedEventsErrorTimeout();
-        TIMEOUT_NO_OF_SECS = errorTimeout > 0 ? errorTimeout : 30;
+        resetTimeout();
 
         while (datafeedId == null) {
             try {
                 datafeedId = datafeedClient.createDatafeed();
+                resetTimeout();
             } catch (ProcessingException e) {
                 handleError(e);
             }
@@ -56,6 +56,11 @@ public DatafeedEventsService(SymBotClient client) {
         stop.set(false);
     }
 
+    private void resetTimeout() {
+        int errorTimeout = this.botClient.getConfig().getDatafeedEventsErrorTimeout();
+        TIMEOUT_NO_OF_SECS = errorTimeout > 0 ? errorTimeout : 30;
+    }
+
     public void addListeners(DatafeedListener... listeners) {
         for (DatafeedListener listener : listeners) {
             if (listener instanceof RoomListener) {
@@ -126,7 +131,9 @@ public void readDatafeed() {
                 CompletableFuture<Object> future = CompletableFuture
                     .supplyAsync(() -> {
                         try {
-                            return datafeedClient.readDatafeed(datafeedId);
+                            List<DatafeedEvent> events = datafeedClient.readDatafeed(datafeedId);
+                            resetTimeout();
+                            return events;
                         } catch (Exception e) {
                             throw new RuntimeException(e);
                         }
@@ -170,7 +177,11 @@ public void restartDatafeedService() {
     private void handleError(Throwable e) {
         if (e.getMessage().endsWith("SocketTimeoutException: Read timed out")) {
             int connectionTimeoutSeconds = botClient.getConfig().getConnectionTimeout() / 1000;
-            logger.info("Connection timed out after {} seconds", connectionTimeoutSeconds);
+            logger.error("Connection timed out after {} seconds", connectionTimeoutSeconds);
+        } else if (e.getMessage().endsWith("Origin Error")) {
+            logger.error("Pod is unavailable");
+        } else if (e.getMessage().contains("Could not find a datafeed with the id")) {
+            logger.error(e.getMessage());
         } else {
             logger.error("HandlerError error", e);
         }
@@ -182,6 +193,7 @@ private void handleError(Throwable e) {
                 ((SymLoadBalancedConfig) config).rotateAgent();
             }
             datafeedId = datafeedClient.createDatafeed();
+            resetTimeout();
         } catch (SymClientException e1) {
             sleep();
             handleError(e);
@@ -191,6 +203,7 @@ private void handleError(Throwable e) {
     private void sleep() {
         try {
             TimeUnit.SECONDS.sleep(TIMEOUT_NO_OF_SECS);
+            TIMEOUT_NO_OF_SECS *= 2;
         } catch (InterruptedException ie) {
             logger.error("Error trying to sleep ", ie);
         }