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.
This commit is contained in:
Aikar
2020-05-10 22:16:17 -04:00
parent 7be16c7ef0
commit 74343ef1be
2 changed files with 64 additions and 35 deletions

View File

@@ -1062,6 +1062,32 @@ public final class CraftServer implements Server {
org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
}
// Paper start - Wait for Async Tasks during shutdown
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();
getLogger().log(Level.SEVERE, String.format(
"Nag author(s): '%s' of '%s' about the following: %s",
plugin.getPluginMeta().getAuthors(),
plugin.getPluginMeta().getDisplayName(),
"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."
));
if (console.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread(worker.getThread(), "still running"); // Paper - Debugging
}
}
// Paper end - Wait for Async Tasks during shutdown
@Override
public void reloadData() {
ReloadCommand.reload(this.console);