fix(discovery): do not fail startup if plugin ping fails (#1700)

cryostatio · Oct 10, 2023 · 026f0e8 · 026f0e8
1 parent e9ddcaf
commit 026f0e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/io/cryostat/discovery/DiscoveryStorage.java b/src/main/java/io/cryostat/discovery/DiscoveryStorage.java
@@ -276,19 +276,25 @@ public void stop() {
         }
     }
 
-    private CompletableFuture<?> pingPrune() {
-        List<CompletableFuture<Boolean>> futures =
+    private CompletableFuture<Void> pingPrune() {
+        List<CompletableFuture<Void>> futures =
                 dao.getAll().stream()
                         .map(
                                 plugin -> {
                                     UUID key = plugin.getId();
                                     URI uri = plugin.getCallback();
                                     return ping(HttpMethod.POST, uri)
-                                            .whenComplete(
+                                            .<Void>handle(
                                                     (v, t) -> {
                                                         if (t != null || !Boolean.TRUE.equals(v)) {
+                                                            if (t != null) {
+                                                                logger.warn(
+                                                                        ExceptionUtils
+                                                                                .getStackTrace(t));
+                                                            }
                                                             removePlugin(key, uri);
                                                         }
+                                                        return null;
                                                     });
                                 })
                         .toList();

diff --git a/src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java b/src/test/java/io/cryostat/discovery/DiscoveryStorageTest.java
@@ -213,6 +213,8 @@ void removesPluginsIfCallbackRejected() throws Exception {
 
         @Test
         void removesPluginsIfCallbackFails() throws Exception {
+            Mockito.when(deployer.deploy(Mockito.any(), Mockito.anyBoolean()))
+                    .thenReturn(Future.succeededFuture());
             EnvironmentNode realm =
                     new EnvironmentNode("realm", BaseNodeType.REALM, Map.of(), Set.of());
             PluginInfo plugin =