mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
papermc/Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch

47 lines
2.6 KiB
Diff
Raw Normal View History

Remove last bit of chunk exists region file fix CraftBukkit removed their implementation that caused this issue, switching to Mojang's implementation which doesn't appear to share it. I already removed the important bit in the last upstream merge, this is just unused and unnecessary now. So we remove it.
2017-04-29 10:27:31 +00:00
From 215acca8d61ac2957f84dc40dfda8bdf6ed7b14a 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
Update upstream B/CB/S
2017-04-29 00:25:52 +00:00
index 8e91be4a1..721a3cd81 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 upstream B/CB/S
2017-04-29 00:25:52 +00:00
@@ -165,11 +165,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
Update upstream B/CB/S
2017-04-29 00:25:52 +00:00
index 5f9678aad..ed840dbc9 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 upstream B/CB/S
2017-04-29 00:25:52 +00:00
@@ -210,8 +210,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 upstream B/CB/S
2017-04-29 00:25:52 +00:00
2.12.2.windows.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
Reference in a new issue Copy permalink