From 4f39daf70aa9519bc46ee758b3090e3055dbb19b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Nov 2016 01:55:36 -0400 Subject: Rework that save cap patch and make it configurable --- Spigot-Server-Patches/0180-Auto-Save-Cap.patch | 48 ---------------- ...0-Prevent-Auto-Save-if-Save-Queue-is-full.patch | 67 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 48 deletions(-) delete mode 100644 Spigot-Server-Patches/0180-Auto-Save-Cap.patch create mode 100644 Spigot-Server-Patches/0180-Prevent-Auto-Save-if-Save-Queue-is-full.patch diff --git a/Spigot-Server-Patches/0180-Auto-Save-Cap.patch b/Spigot-Server-Patches/0180-Auto-Save-Cap.patch deleted file mode 100644 index 255675190b..0000000000 --- a/Spigot-Server-Patches/0180-Auto-Save-Cap.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5b011605906059b3d7fbd31206ba146c866300ea Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Thu, 3 Nov 2016 21:52:22 -0400 -Subject: [PATCH] Auto Save Cap - - -diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 7e53fee..0f529e6 100644 ---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java -+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -253,6 +253,13 @@ public class ChunkProviderServer implements IChunkProvider { - int i = 0; - - // CraftBukkit start -+ // Paper start -+ final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProviderServer().chunkLoader; -+ final int autoSaveLimit = world.paperConfig.maxAutoSaveChunksPerTick - chunkLoader.getQueueSize(); -+ if (autoSaveLimit < 1) { -+ return false; -+ } -+ // Paper end - Iterator iterator = this.chunks.values().iterator(); - while (iterator.hasNext()) { - Chunk chunk = (Chunk) iterator.next(); -@@ -266,7 +273,7 @@ public class ChunkProviderServer implements IChunkProvider { - this.saveChunk(chunk); - chunk.f(false); - ++i; -- if (!flag && i >= world.paperConfig.maxAutoSaveChunksPerTick) { // Spigot - // Paper - Incremental Auto Save - cap max per tick -+ if (!flag && i >= autoSaveLimit) { // Spigot - // Paper - Incremental Auto Save - cap max per tick - return false; - } - } -diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index b672a38..70e71cc 100644 ---- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java -+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -@@ -33,6 +33,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { - } - - // CraftBukkit start -+ public int getQueueSize() { return queue.size(); } // Paper - public boolean chunkExists(World world, int i, int j) { - ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); - --- -2.10.2 - diff --git a/Spigot-Server-Patches/0180-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0180-Prevent-Auto-Save-if-Save-Queue-is-full.patch new file mode 100644 index 0000000000..6053eb30f5 --- /dev/null +++ b/Spigot-Server-Patches/0180-Prevent-Auto-Save-if-Save-Queue-is-full.patch @@ -0,0 +1,67 @@ +From de20f349b8fdc5cb057267034bb9926673706aa1 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 3 Nov 2016 21:52:22 -0400 +Subject: [PATCH] Prevent Auto Save if Save Queue is full + +If the save queue already has 50 (configurable) of chunks pending, +then avoid processing auto save (which would add more) + +diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +index 51b34d9..9d361cb 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +@@ -394,6 +394,11 @@ public class PaperWorldConfig { + maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24); + } + ++ public int queueSizeAutoSaveThreshold = 50; ++ private void queueSizeAutoSaveThreshold() { ++ queueSizeAutoSaveThreshold = getInt("save-queue-limit-for-auto-save", 50); ++ } ++ + public boolean removeCorruptTEs = false; + private void removeCorruptTEs() { + removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false); +diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java +index 7e53fee..99afdb7 100644 +--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java ++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +@@ -253,6 +253,14 @@ public class ChunkProviderServer implements IChunkProvider { + int i = 0; + + // CraftBukkit start ++ // Paper start ++ final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProviderServer().chunkLoader; ++ final int queueSize = chunkLoader.getQueueSize(); ++ if (queueSize > world.paperConfig.queueSizeAutoSaveThreshold){ ++ return false; ++ } ++ final int autoSaveLimit = world.paperConfig.maxAutoSaveChunksPerTick; ++ // Paper end + Iterator iterator = this.chunks.values().iterator(); + while (iterator.hasNext()) { + Chunk chunk = (Chunk) iterator.next(); +@@ -266,7 +274,7 @@ public class ChunkProviderServer implements IChunkProvider { + this.saveChunk(chunk); + chunk.f(false); + ++i; +- if (!flag && i >= world.paperConfig.maxAutoSaveChunksPerTick) { // Spigot - // Paper - Incremental Auto Save - cap max per tick ++ if (!flag && i >= autoSaveLimit) { // Spigot - // Paper - Incremental Auto Save - cap max per tick + return false; + } + } +diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +index b672a38..70e71cc 100644 +--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java ++++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +@@ -33,6 +33,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { + } + + // CraftBukkit start ++ public int getQueueSize() { return queue.size(); } // Paper + public boolean chunkExists(World world, int i, int j) { + ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); + +-- +2.10.2 + -- cgit v1.2.3