2019-01-01 03:15:55 +00:00
|
|
|
From 008135e17f9a4a70e8cbc0593fd9c9cdfebd8f0a Mon Sep 17 00:00:00 2001
|
2016-11-04 05:33:08 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Thu, 3 Nov 2016 21:52:22 -0400
|
2016-11-04 05:55:36 +00:00
|
|
|
Subject: [PATCH] Prevent Auto Save if Save Queue is full
|
2016-11-04 05:33:08 +00:00
|
|
|
|
2016-11-04 05:55:36 +00:00
|
|
|
If the save queue already has 50 (configurable) of chunks pending,
|
|
|
|
then avoid processing auto save (which would add more)
|
2016-11-04 05:33:08 +00:00
|
|
|
|
2016-11-04 05:55:36 +00:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-12-13 00:40:29 +00:00
|
|
|
index e8417cb2e..de59f4ce0 100644
|
2016-11-04 05:55:36 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-12-13 00:40:29 +00:00
|
|
|
@@ -332,6 +332,11 @@ public class PaperWorldConfig {
|
2016-11-04 05:55:36 +00:00
|
|
|
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);
|
2016-11-04 05:33:08 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
2019-01-01 03:15:55 +00:00
|
|
|
index 91533f8ac..8e4c1b39a 100644
|
2016-11-04 05:33:08 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -233,6 +233,13 @@ public class ChunkProviderServer implements IChunkProvider {
|
2018-08-26 18:11:49 +00:00
|
|
|
synchronized (this.chunkLoader) {
|
|
|
|
ObjectIterator objectiterator = this.chunks.values().iterator();
|
2016-11-04 05:33:08 +00:00
|
|
|
|
2018-08-26 18:11:49 +00:00
|
|
|
+ // Paper start
|
2018-12-17 05:18:06 +00:00
|
|
|
+ final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProvider().chunkLoader;
|
2018-08-26 18:11:49 +00:00
|
|
|
+ final int queueSize = chunkLoader.getQueueSize();
|
2018-10-05 15:23:20 +00:00
|
|
|
+ if (!flag && queueSize > world.paperConfig.queueSizeAutoSaveThreshold){
|
2018-08-26 18:11:49 +00:00
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
while (objectiterator.hasNext()) {
|
|
|
|
Chunk chunk = (Chunk) objectiterator.next();
|
2018-07-16 20:08:09 +00:00
|
|
|
|
2016-11-04 05:33:08 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
2019-01-01 03:15:55 +00:00
|
|
|
index 030461026..6909b9e45 100644
|
2016-11-04 05:33:08 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -150,6 +150,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
2018-08-26 18:11:49 +00:00
|
|
|
|
2016-11-04 05:33:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
+ public int getQueueSize() { return queue.size(); } // Paper
|
2017-04-29 00:25:52 +00:00
|
|
|
+
|
|
|
|
// CraftBukkit start - Add async variant, provide compatibility
|
|
|
|
@Nullable
|
2018-08-26 18:11:49 +00:00
|
|
|
public Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException {
|
2016-11-04 05:33:08 +00:00
|
|
|
--
|
2019-01-01 03:15:55 +00:00
|
|
|
2.20.1
|
2016-11-04 05:33:08 +00:00
|
|
|
|