From ef708476ca44e44eccf6c3540ae3ef038fb689ad Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Mon, 21 Aug 2023 17:40:51 +0200
Subject: [PATCH] Be a bit more specific with exception handling.

---
 .../jdrupes/vmoperator/manager/VmWatcher.java | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java
index f32c178..a304c0b 100644
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java
@@ -199,15 +199,14 @@ public class VmWatcher extends Component {
         return result;
     }
 
-    @SuppressWarnings("PMD.CognitiveComplexity")
     private void watchVmDefs(V1APIResource crd, String version) {
         @SuppressWarnings({ "PMD.AvoidInstantiatingObjectsInLoops",
-            "PMD.AvoidLiteralsInIfCondition", "PMD.AvoidCatchingThrowable" })
+            "PMD.AvoidCatchingThrowable", "PMD.AvoidCatchingGenericException" })
         var watcher = new Thread(() -> {
             try {
                 // Watch sometimes terminates without apparent reason.
                 while (true) {
-                    Instant started = Instant.now();
+                    Instant startedAt = Instant.now();
                     var client = Config.defaultClient();
                     var coa = new CustomObjectsApi(client);
                     var call = coa.listNamespacedCustomObjectCall(VM_OP_GROUP,
@@ -220,23 +219,14 @@ public class VmWatcher extends Component {
                         for (Watch.Response<V1Namespace> item : watch) {
                             handleVmDefinitionChange(crd, item);
                         }
-                    } catch (Throwable e) {
-                        logger.log(Level.FINE, e, () -> "Probem watching "
-                            + "(retrying): " + e.getMessage());
-                        var runningFor = Duration
-                            .between(started, Instant.now()).getSeconds();
-                        if (runningFor < 5) {
-                            logger.log(Level.FINE, e, () -> "Waiting... ");
-                            try {
-                                Thread.sleep(5000 - runningFor * 1000);
-                            } catch (InterruptedException e1) {
-                                continue;
-                            }
-                            logger.log(Level.FINE, e, () -> "Restarting");
-                        }
+                    } catch (IOException | ApiException | RuntimeException e) {
+                        logger.log(Level.FINE, e, () -> "Problem watching \""
+                            + crd.getName() + "\" (will retry): "
+                            + e.getMessage());
+                        delayRestart(startedAt);
                     }
                 }
-            } catch (IOException | ApiException e) {
+            } catch (Throwable e) {
                 logger.log(Level.SEVERE, e, () -> "Probem watching: "
                     + e.getMessage());
             }
@@ -246,6 +236,21 @@ public class VmWatcher extends Component {
         watcher.start();
     }
 
+    @SuppressWarnings("PMD.AvoidLiteralsInIfCondition")
+    private void delayRestart(Instant started) {
+        var runningFor = Duration
+            .between(started, Instant.now()).toMillis();
+        if (runningFor < 5000) {
+            logger.log(Level.FINE, () -> "Waiting... ");
+            try {
+                Thread.sleep(5000 - runningFor);
+            } catch (InterruptedException e1) { // NOPMD
+                // Retry
+            }
+            logger.log(Level.FINE, () -> "Retrying");
+        }
+    }
+
     private void handleVmDefinitionChange(V1APIResource vmsCrd,
             Watch.Response<V1Namespace> item) {
         V1ObjectMeta metadata = item.object.getMetadata();