honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with Gradle daemons hanging indefinitely on shutdown (#44867) (#44878)

Browse Source
This commit is contained in:
Mark Vieira 2019-07-25 15:33:51 -07:00 committed by GitHub
parent 03605169f3
commit aebfdf1477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClusterCleanupOnShutdown.java
View File

@ -19,16 +19,12 @@ public class TestClusterCleanupOnShutdown implements Runnable {
private Set<ElasticsearchCluster> clustersToWatch = new HashSet<>(); private Set<ElasticsearchCluster> clustersToWatch = new HashSet<>();
public void watch(Collection<ElasticsearchCluster> cluster) { public synchronized void watch(Collection<ElasticsearchCluster> clusters) {
synchronized (clustersToWatch) { clustersToWatch.addAll(clusters);
clustersToWatch.addAll(clustersToWatch);
}
} }
public void unWatch(Collection<ElasticsearchCluster> cluster) { public synchronized void unWatch(Collection<ElasticsearchCluster> clusters) {
synchronized (clustersToWatch) { clustersToWatch.removeAll(clusters);
clustersToWatch.removeAll(clustersToWatch);
}
} }
@Override @Override
@ -38,7 +34,11 @@ public class TestClusterCleanupOnShutdown implements Runnable {
Thread.sleep(Long.MAX_VALUE); Thread.sleep(Long.MAX_VALUE);
} }
} catch (InterruptedException interrupted) { } catch (InterruptedException interrupted) {
synchronized (clustersToWatch) { shutdownClusters();
}
}
public synchronized void shutdownClusters() {
if (clustersToWatch.isEmpty()) { if (clustersToWatch.isEmpty()) {
return; return;
} }
@ -54,6 +54,4 @@ public class TestClusterCleanupOnShutdown implements Runnable {
} }
} }
} }
}
}
} }

3
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersCleanupExtension.java
View File

@ -33,7 +33,6 @@ public class TestClustersCleanupExtension {
executorService.submit(cleanupThread); executorService.submit(cleanupThread);
} }
public static void createExtension(Project project) { public static void createExtension(Project project) {
if (project.getRootProject().getExtensions().findByType(TestClustersCleanupExtension.class) != null) { if (project.getRootProject().getExtensions().findByType(TestClustersCleanupExtension.class) != null) {
return; return;
@ -43,7 +42,7 @@ public class TestClustersCleanupExtension {
"__testclusters_rate_limit", "__testclusters_rate_limit",
TestClustersCleanupExtension.class TestClustersCleanupExtension.class
); );
Thread shutdownHook = new Thread(ext.cleanupThread::run); Thread shutdownHook = new Thread(ext.cleanupThread::shutdownClusters);
Runtime.getRuntime().addShutdownHook(shutdownHook); Runtime.getRuntime().addShutdownHook(shutdownHook);
project.getGradle().buildFinished(buildResult -> { project.getGradle().buildFinished(buildResult -> {
ext.executorService.shutdownNow(); ext.executorService.shutdownNow();