core/testserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make the shutdown thread try to shutdown on main

Browse source
This commit is contained in:
Aikar 2020-04-13 03:30:12 -04:00
parent 8918245090
commit 81706e6268
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 59 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Spigot-Server-Patches/0469-Allow-shutting-down-server-during-a-watchdog-hang-gr.patch
View file

@ -1,4 +1,4 @@
From e231dc58a43fc554fa22970df42b43f2e59f07ba Mon Sep 17 00:00:00 2001 From 9aa8c43914b453de4e0a7449f3c70b4f6b07d0e8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 12 Apr 2020 15:50:48 -0400 Date: Sun, 12 Apr 2020 15:50:48 -0400
Subject: [PATCH] Allow shutting down server during a watchdog hang gracefully Subject: [PATCH] Allow shutting down server during a watchdog hang gracefully
@ -38,6 +38,33 @@ index 2686874f2..a9b533751 100644
} }
public String getServerIp() { public String getServerIp() {
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
index 449e99d1b..f255c448a 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -12,9 +12,22 @@ public class ServerShutdownThread extends Thread {
@Override
public void run() {
try {
+ // Paper start - try to shutdown on main
+ server.safeShutdown(false, false);
+ for (int i = 1000; i > 0 && !server.hasStopped(); i -= 100) {
+ Thread.sleep(100);
+ }
+ if (server.hasStopped()) {
+ return;
+ }
+ // Looks stalled, close async
org.spigotmc.AsyncCatcher.enabled = false; // Spigot
org.spigotmc.AsyncCatcher.shuttingDown = true; // Paper
+ server.forceTicks = true;
server.close();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ // Paper end
} finally {
try {
net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
index aefea3a9a..123de5ac9 100644 index aefea3a9a..123de5ac9 100644
--- a/src/main/java/org/spigotmc/RestartCommand.java --- a/src/main/java/org/spigotmc/RestartCommand.java
@ -52,33 +79,56 @@ index aefea3a9a..123de5ac9 100644
String[] split = restartScript.split( " " ); String[] split = restartScript.split( " " );
if ( split.length > 0 && new File( split[0] ).isFile() ) if ( split.length > 0 && new File( split[0] ).isFile() )
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 5bdcdcf9e..704e8426a 100644 index 5bdcdcf9e..6dda6d168 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java --- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -69,7 +69,7 @@ public class WatchdogThread extends Thread @@ -69,10 +69,11 @@ public class WatchdogThread extends Thread
long currentTime = monotonicMillis(); long currentTime = monotonicMillis();
if ( lastTick != 0 && currentTime > lastTick + earlyWarningEvery && !Boolean.getBoolean("disable.watchdog") ) if ( lastTick != 0 && currentTime > lastTick + earlyWarningEvery && !Boolean.getBoolean("disable.watchdog") )
{ {
- boolean isLongTimeout = currentTime > lastTick + timeoutTime; - boolean isLongTimeout = currentTime > lastTick + timeoutTime;
+ boolean isLongTimeout = currentTime > lastTick + timeoutTime || !MinecraftServer.getServer().isRunning(); + MinecraftServer server = MinecraftServer.getServer();
+ boolean isLongTimeout = currentTime > lastTick + timeoutTime || !server.isRunning();
// Don't spam early warning dumps // Don't spam early warning dumps
if ( !isLongTimeout && (earlyWarningEvery <= 0 || !hasStarted || currentTime < lastEarlyWarning + earlyWarningEvery || currentTime < lastTick + earlyWarningDelay)) continue; if ( !isLongTimeout && (earlyWarningEvery <= 0 || !hasStarted || currentTime < lastEarlyWarning + earlyWarningEvery || currentTime < lastTick + earlyWarningDelay)) continue;
if ( !isLongTimeout && MinecraftServer.getServer().hasStopped()) continue; // Don't spam early watchdog warnings during shutdown, we'll come back to this... - if ( !isLongTimeout && MinecraftServer.getServer().hasStopped()) continue; // Don't spam early watchdog warnings during shutdown, we'll come back to this...
@@ -135,9 +135,15 @@ public class WatchdogThread extends Thread + if ( !isLongTimeout && server.hasStopped()) continue; // Don't spam early watchdog warnings during shutdown, we'll come back to this...
lastEarlyWarning = currentTime;
if (isLongTimeout) {
// Paper end
@@ -114,7 +115,7 @@ public class WatchdogThread extends Thread
log.log( Level.SEVERE, "------------------------------" );
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
ChunkTaskManager.dumpAllChunkLoadInfo(); // Paper
- dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
+ dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( server.serverThread.getId(), Integer.MAX_VALUE ), log );
log.log( Level.SEVERE, "------------------------------" );
//
// Paper start - Only print full dump on long timeouts
@@ -135,9 +136,24 @@ public class WatchdogThread extends Thread
if ( isLongTimeout ) if ( isLongTimeout )
{ {
- if ( restart && !MinecraftServer.getServer().hasStopped() ) - if ( restart && !MinecraftServer.getServer().hasStopped() )
+ if ( !MinecraftServer.getServer().hasStopped() ) + if ( !server.hasStopped() )
{ {
- RestartCommand.restart(); - RestartCommand.restart();
+ AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us + AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us
+ AsyncCatcher.shuttingDown = true; + AsyncCatcher.shuttingDown = true;
+ MinecraftServer.getServer().forceTicks = true; + server.forceTicks = true;
+ if (restart) { + if (restart) {
+ RestartCommand.addShutdownHook( SpigotConfig.restartScript ); + RestartCommand.addShutdownHook( SpigotConfig.restartScript );
+ } + }
+ MinecraftServer.getServer().close(); + // try one last chance to safe shutdown on main incase it 'comes back'
+ server.safeShutdown(false, restart);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ if (!server.hasStopped()) {
+ server.close();
+ }
} }
break; break;
} // Paper end } // Paper end