SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität
9c4490bda4
Paper/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch

47 Zeilen
2.5 KiB
Diff
Originalformat Normale Ansicht Verlauf

Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 09:55:24 +02:00
From bc3a702f71fbd98ac83d02992c8df88a9207e765 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 06:35:26 +01: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
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 09:55:24 +02:00
index 4c3faa201..12bd558a7 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 06:35:26 +01:00
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
Update S
2017-08-12 23:32:01 +02:00
@@ -194,11 +194,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
// CraftBukkit
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 06:35:26 +01:00
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 04:33:09 +02: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 06:35:26 +01:00
}
Update S
2017-08-12 23:32:01 +02:00
synchronized (lock) { if (this.b.get(chunkcoordintpair) == chunk.compoundSupplier) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
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 06:35:26 +01:00
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 09:55:24 +02:00
index 6a92b5af8..5bcbd718f 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 06:35:26 +01: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 02:25:52 +02: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 06:35:26 +01:00
Update Paper to MC 1.11
2016-11-17 03:23:38 +01: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 06:35:26 +01: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
}
}
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 09:55:24 +02:00
2.18.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 06:35:26 +01:00
In neuem Issue referenzieren Permalink kopieren