geforkt von Mirrors/Paper
Fix deadlock on watchdog crash (#7535)
Dieser Commit ist enthalten in:
Ursprung
1641e0c524
Commit
c94cfa4291
21
patches/server/Fix-deadlock-on-watchdog-crash.patch
Normale Datei
21
patches/server/Fix-deadlock-on-watchdog-crash.patch
Normale Datei
@ -0,0 +1,21 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
||||
Date: Fri, 4 Mar 2022 00:12:49 -0700
|
||||
Subject: [PATCH] Fix deadlock on watchdog crash
|
||||
|
||||
The watchdog thread sets MinecraftServer#forceTicks to true which will
|
||||
cause waitUntilNextTick to hang when the task queue is drained.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
}, false);
|
||||
}
|
||||
|
||||
- this.waitUntilNextTick();
|
||||
+ this.managedBlock(() -> !this.canSleepForTickNoOversleep() || this.getPendingTasksCount() == 0); // Paper - based on waitUntilNextTick
|
||||
}
|
||||
|
||||
this.saveAllChunks(false, true, false);
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren