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

47 lines
2.6 KiB
Diff
Raw Normal View History

Optimize isInvalidYLocation, getType and getBlockData Some pretty micro optimizations, but this is the hottest method in the server.... This will drastically reduce number of operations to perform getType the 2 previous patches was squashed into 1
2016-06-23 02:43:02 +00:00
From a71fb1acf842874b674263765f8685d47ae4aafa 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
2016-06-23 02:18:41 +00:00
index c89d533..940f4e9 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 CB/S
2016-06-12 17:00:07 +00:00
@@ -174,11 +174,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
+ if (laste != null) { com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(laste); laste.printStackTrace(); } // Paper
}
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
2016-06-16 23:22:35 +00:00
index c9bd856..1fe5019 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
2016-06-16 23:22:35 +00:00
@@ -246,8 +246,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
this.b(i, j, (int) (MinecraftServer.av() / 1000L));
} 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
2016-06-23 02:18:41 +00:00
2.9.0
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