Provide more logging in retry logic

alexcreasy · Sep 11, 2020 · d2195d4 · d2195d4
1 parent e5d4119
commit d2195d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/common/src/main/java/org/jboss/pnc/common/monitor/ScheduledExecutorServiceWithTimeout.java b/common/src/main/java/org/jboss/pnc/common/monitor/ScheduledExecutorServiceWithTimeout.java
@@ -23,11 +23,16 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>
  */
 public class ScheduledExecutorServiceWithTimeout {
 
+    private static final Logger logger = LoggerFactory.getLogger(ScheduledExecutorServiceWithTimeout.class);
+
     private ScheduledExecutorService executorService;
 
     public ScheduledExecutorServiceWithTimeout(ScheduledExecutorService executorService) {
@@ -51,6 +56,7 @@ public CancellableCompletableFuture<Void> scheduleWithFixedDelayAndTimeout(
                     completableFuture.complete(null);
                 }
             } catch (Throwable t) {
+                logger.error("Error while calling supplier.get()", t);
                 completableFuture.completeExceptionally(t);
             }
         };

diff --git a/...driver/src/main/java/org/jboss/pnc/environment/openshift/OpenshiftStartedEnvironment.java b/...driver/src/main/java/org/jboss/pnc/environment/openshift/OpenshiftStartedEnvironment.java
@@ -506,7 +506,10 @@ private void monitorInitialization(
                                 // the status is not to be retried
                                 onError.accept(new Exception(throwable));
                             } else {
-                                logger.error("Creating build environment failed! Retrying...", throwable);
+                                logger.error(
+                                        "Creating build environment failed! Retrying ({} retries left)...",
+                                        throwable,
+                                        retries);
                                 retryEnvironment(onComplete, onError, retries);
                             }
                         }
@@ -570,6 +573,7 @@ private boolean isPodRunning() {
         logger.debug("Pod {} status: {}", pod.getName(), podStatus);
 
         if (Arrays.asList(POD_FAILED_STATUSES).contains(podStatus)) {
+            logger.debug("Pod failed with status: {}", podStatus);
             gaugeMetric.ifPresent(g -> g.incrementMetric(METRICS_POD_STARTED_FAILED_REASON_KEY + "." + podStatus));
             throw new PodFailedStartException("Pod failed with status: " + podStatus, podStatus);
         }