Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with Gradle daemons hanging indefinitely on shutdown #44867

Merged
merged 3 commits into from
Jul 25, 2019
Merged

Fix issue with Gradle daemons hanging indefinitely on shutdown #44867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
581c847
Fix issue with Gradle daemons hanging indefinitely on shutdown
mark-vieira Jul 25, 2019
1c53e9e
Fix registration of watched clusters
mark-vieira Jul 25, 2019
da5e0a3
Polish
mark-vieira Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions ...Src/src/main/java/org/elasticsearch/gradle/testclusters/TestClusterCleanupOnShutdown.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ public class TestClusterCleanupOnShutdown implements Runnable {

private Set<ElasticsearchCluster> clustersToWatch = new HashSet<>();

public void watch(Collection<ElasticsearchCluster> cluster) {
synchronized (clustersToWatch) {
clustersToWatch.addAll(clustersToWatch);
}
public synchronized void watch(Collection<ElasticsearchCluster> cluster) {
clustersToWatch.addAll(clustersToWatch);
}

public void unWatch(Collection<ElasticsearchCluster> cluster) {
synchronized (clustersToWatch) {
clustersToWatch.removeAll(clustersToWatch);
}
public synchronized void unWatch(Collection<ElasticsearchCluster> cluster) {
clustersToWatch.removeAll(clustersToWatch);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be clustersToWatch.removeAll(cluster)? (note, the name cluster shoudl really be plural since it is a collection?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Looks like we were never actually registering this clusters to be watched.

}

@Override
Expand All @@ -38,21 +34,23 @@ public void run() {
Thread.sleep(Long.MAX_VALUE);
}
} catch (InterruptedException interrupted) {
synchronized (clustersToWatch) {
if (clustersToWatch.isEmpty()) {
return;
}
logger.info("Cleanup thread was interrupted, shutting down all clusters");
Iterator<ElasticsearchCluster> iterator = clustersToWatch.iterator();
while (iterator.hasNext()) {
ElasticsearchCluster cluster = iterator.next();
iterator.remove();
try {
cluster.stop(false);
} catch (Exception e) {
logger.warn("Could not shut down {}", cluster, e);
}
}
shutdownClusters();
}
}

public synchronized void shutdownClusters() {
if (clustersToWatch.isEmpty()) {
return;
}
logger.info("Cleanup thread was interrupted, shutting down all clusters");
Iterator<ElasticsearchCluster> iterator = clustersToWatch.iterator();
while (iterator.hasNext()) {
ElasticsearchCluster cluster = iterator.next();
iterator.remove();
try {
cluster.stop(false);
} catch (Exception e) {
logger.warn("Could not shut down {}", cluster, e);
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...Src/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersCleanupExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public TestClustersCleanupExtension() {
executorService.submit(cleanupThread);
}


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