core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0068-Chunk-Save-Reattempt.p...

47 lines
2.6 KiB
Diff
Raw Normal View History

Update bStats implementation
2017-04-22 06:16:45 +00:00
From 82e7c9b1c02794288a3242d11d2b62ee3c46369b Mon Sep 17 00:00:00 2001
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Mar 2013 23:46:10 -0500
Subject: [PATCH] Chunk Save Reattempt
We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
Switch to a bStats based Metrics system
2017-03-25 05:22:02 +00:00
index 7f3e874ba..310ab96ab 100644
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
@@ -182,11 +182,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
NBTTagCompound nbttagcompound = chunk.compound; // Paper - Chunk queue improvements
if (nbttagcompound != null) {
+ int attempts = 0; Exception laste = null; while (attempts++ < 5) { // Paper
try {
this.b(chunkcoordintpair, nbttagcompound);
+ laste = null; break; // Paper
} catch (Exception exception) {
- ChunkRegionLoader.a.error("Failed to save chunk", exception);
+ //ChunkRegionLoader.a.error("Failed to save chunk", exception); // Paper
+ laste = exception; // Paper
}
+ try {Thread.sleep(10);} catch (InterruptedException e) {e.printStackTrace();} } // Paper
Log chunk save failures as ERROR level
2016-09-22 02:33:09 +00:00
+ if (laste != null) { com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(laste); MinecraftServer.LOGGER.error("Failed to save chunk", laste); } // Paper
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
}
synchronized (lock) { if (this.b.get(chunkcoordintpair) == nbttagcompound) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
Switch to a bStats based Metrics system
2017-03-25 05:22:02 +00:00
index be13c1131..9cfc46bc2 100644
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
@@ -249,8 +249,7 @@ public class RegionFile {
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
this.b(i, j, (int) (MinecraftServer.aw() / 1000L));
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00
} catch (IOException ioexception) {
- ioexception.printStackTrace();
- ServerInternalException.reportInternalException(ioexception); // Paper
+ org.spigotmc.SneakyThrow.sneaky(ioexception); // Paper - we want the upper try/catch to retry this
}
}
--
Update bStats implementation
2017-04-22 06:16:45 +00:00
2.12.2
Chunk Save Reattempt Sometimes a chunk region file is closed prematurely, resulting in a "Stream Closed" error on chunk saving. Ultimately there is a race condition that causes it, but re-trying the save will avoid the issue. Retry the save 5 times to try our best to avoid rollbacks due to chunk save failures.
2016-03-18 05:35:26 +00:00