64 lines
2.9 KiB
Diff
64 lines
2.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sun, 10 May 2020 22:16:17 -0400
|
||
|
|
Subject: [PATCH] Wait for Async Tasks during shutdown
|
||
|
|
|
||
|
|
Server.reload() had this logic to give time for tasks to shutdown,
|
||
|
|
however shutdown did not...
|
||
|
|
|
||
|
|
Adds a 5 second grace period for any async tasks to finish and warns
|
||
|
|
if any are still running after that delay just as reload does.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
index 74f393ffa2ae2d0e25b3f0b674cef7a987e985d3..f530c739b6aee3718eb5d0e0e6a09d882d817c68 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
@@ -892,6 +892,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
// CraftBukkit start
|
||
|
|
if (this.server != null) {
|
||
|
|
this.server.disablePlugins();
|
||
|
|
+ this.server.waitForAsyncTasksShutdown(); // Paper
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
if (this.getConnection() != null) {
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
index c6dc314a1735bf849ee1572e01335909bed9b455..92f1a6d32a96fee682342e86c3ffd3c65292150b 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -937,6 +937,35 @@ public final class CraftServer implements Server {
|
||
|
|
org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ public void waitForAsyncTasksShutdown() {
|
||
|
|
+ int pollCount = 0;
|
||
|
|
+
|
||
|
|
+ // Wait for at most 5 seconds for plugins to close their threads
|
||
|
|
+ while (pollCount < 10*5 && getScheduler().getActiveWorkers().size() > 0) {
|
||
|
|
+ try {
|
||
|
|
+ Thread.sleep(100);
|
||
|
|
+ } catch (InterruptedException e) {}
|
||
|
|
+ pollCount++;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ List<BukkitWorker> overdueWorkers = getScheduler().getActiveWorkers();
|
||
|
|
+ for (BukkitWorker worker : overdueWorkers) {
|
||
|
|
+ Plugin plugin = worker.getOwner();
|
||
|
|
+ String author = "<NoAuthorGiven>";
|
||
|
|
+ if (plugin.getDescription().getAuthors().size() > 0) {
|
||
|
|
+ author = plugin.getDescription().getAuthors().get(0);
|
||
|
|
+ }
|
||
|
|
+ getLogger().log(Level.SEVERE, String.format(
|
||
|
|
+ "Nag author: '%s' of '%s' about the following: %s",
|
||
|
|
+ author,
|
||
|
|
+ plugin.getDescription().getName(),
|
||
|
|
+ "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
|
||
|
|
+ ));
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
@Override
|
||
|
|
public void reloadData() {
|
||
|
|
ReloadCommand.reload(console);
|