mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-12 01:41:05 +01:00
42433c2626
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09f10fd9 SPIGOT-5950: Add PrepareSmithingEvent event CraftBukkit Changes:7c03d257SPIGOT-6011: End Gateways do not work on Non-Main End Worldsd492e363SPIGOT-6015: Small Armor Stand doesn't drop items5db13eeaSPIGOT-5950: Add PrepareSmithingEvent event
63 lines
2.9 KiB
Diff
63 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 b32d41fac5f855e302469209f368c3674b849fe3..7c1c929819c450f853c91618b2853fcb424caa22 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -772,6 +772,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
// CraftBukkit start
|
|
if (this.server != null) {
|
|
this.server.disablePlugins();
|
|
+ this.server.waitForAsyncTasksShutdown(); // Paper
|
|
}
|
|
// CraftBukkit end
|
|
if (this.getServerConnection() != null) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 810c0236da937ecbd12a10c5beffe0859842e056..11c9b740b6b1ff30bd33c188c03f2b77b12faf7b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -934,6 +934,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() {
|
|
CommandReload.reload(console);
|