Merge pull request quarkusio#19522 from stuartwdouglas/19509

Remove DevServices shutdown hooks
zakkak · Aug 20, 2021 · ef4bcaf · ef4bcaf
2 parents adcb9df + b6b1de0
commit ef4bcaf
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 50 deletions.
diff --git a/...src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java b/...src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java
@@ -102,14 +102,6 @@ public void run() {
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Apicurio Registry container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() {
-                @Override
-                public void run() {
-                    Runtime.getRuntime().removeShutdownHook(closeHookThread);
-                }
-            });
         }
     }
 

diff --git a/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
@@ -161,14 +161,6 @@ public void run() {
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Database shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() {
-                @Override
-                public void run() {
-                    Runtime.getRuntime().removeShutdownHook(closeHookThread);
-                }
-            });
         }
         databases = closeableList;
         cachedProperties = propertiesMap;

diff --git a/...eployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java b/...eployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
@@ -111,9 +111,6 @@ public DevServicesKafkaBrokerBuildItem startKafkaDevService(
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Kafka container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(() -> Runtime.getRuntime().removeShutdownHook(closeHookThread));
         }
         cfg = configuration;
 

diff --git a/...ent/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java b/...ent/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java
@@ -117,14 +117,6 @@ public void run() {
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Mongo container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() {
-                @Override
-                public void run() {
-                    Runtime.getRuntime().removeShutdownHook(closeHookThread);
-                }
-            });
         }
         closeables = currentCloseables;
         capturedProperties = currentCapturedProperties;

diff --git a/...in/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java b/...in/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java
@@ -160,14 +160,6 @@ public void run() {
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Keycloak container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() {
-                @Override
-                public void run() {
-                    Runtime.getRuntime().removeShutdownHook(closeHookThread);
-                }
-            });
         }
 
         capturedKeycloakUrl = startResult.url + "/auth";

diff --git a/...eployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java b/...eployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
@@ -117,9 +117,6 @@ public void startRedisContainers(LaunchModeBuildItem launchMode,
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Redis container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(() -> Runtime.getRuntime().removeShutdownHook(closeHookThread));
         }
     }
 

diff --git a/.../java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/DevServicesAmqpProcessor.java b/.../java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/DevServicesAmqpProcessor.java
@@ -107,9 +107,6 @@ public DevServicesAmqpBrokerBuildItem startAmqpDevService(
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "AMQP container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(() -> Runtime.getRuntime().removeShutdownHook(closeHookThread));
         }
         cfg = configuration;
         return artemis;

diff --git a/...vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java b/...vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
@@ -93,14 +93,6 @@ public void run() {
             };
             QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
             ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-            Thread closeHookThread = new Thread(closeTask, "Vault container shutdown thread");
-            Runtime.getRuntime().addShutdownHook(closeHookThread);
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() {
-                @Override
-                public void run() {
-                    Runtime.getRuntime().removeShutdownHook(closeHookThread);
-                }
-            });
         }
         for (Map.Entry<String, String> entry : connectionProperties.entrySet()) {
             devConfig.produce(new DevServicesConfigResultBuildItem(entry.getKey(), entry.getValue()));

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -339,6 +339,7 @@ public Thread newThread(Runnable r) {
                         .setTest(true)
                         .build()
                         .bootstrap();
+                shutdownTasks.add(curatedApplication::close);
             }
 
             if (curatedApplication.getAppModel().getUserDependencies().isEmpty()) {
@@ -1269,7 +1270,11 @@ public void close() {
                         ConfigProviderResolver.setInstance(null);
                     }
                 }
-                Runtime.getRuntime().removeShutdownHook(shutdownHook);
+                try {
+                    Runtime.getRuntime().removeShutdownHook(shutdownHook);
+                } catch (Throwable t) {
+                    //won't work if we are already shutting down
+                }
             }
         }
     }