core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework that save cap patch and make it configurable

This commit is contained in:
Aikar 2016-11-04 01:55:36 -04:00
parent ab7b7d8072
commit 4f39daf70a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Spigot-Server-Patches/0180-Auto-Save-Cap.patch → Spigot-Server-Patches/0180-Prevent-Auto-Save-if-Save-Queue-is-full.patch
View File

@ -1,28 +1,47 @@
From 5b011605906059b3d7fbd31206ba146c866300ea Mon Sep 17 00:00:00 2001 From de20f349b8fdc5cb057267034bb9926673706aa1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Nov 2016 21:52:22 -0400 Date: Thu, 3 Nov 2016 21:52:22 -0400
Subject: [PATCH] Auto Save Cap 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 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 7e53fee..0f529e6 100644 index 7e53fee..99afdb7 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/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 { @@ -253,6 +253,14 @@ public class ChunkProviderServer implements IChunkProvider {
int i = 0; int i = 0;
// CraftBukkit start // CraftBukkit start
+ // Paper start + // Paper start
+ final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProviderServer().chunkLoader; + final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProviderServer().chunkLoader;
+ final int autoSaveLimit = world.paperConfig.maxAutoSaveChunksPerTick - chunkLoader.getQueueSize(); + final int queueSize = chunkLoader.getQueueSize();
+ if (autoSaveLimit < 1) { + if (queueSize > world.paperConfig.queueSizeAutoSaveThreshold){
+ return false; + return false;
+ } + }
+ final int autoSaveLimit = world.paperConfig.maxAutoSaveChunksPerTick;
+ // Paper end + // Paper end
Iterator iterator = this.chunks.values().iterator(); Iterator iterator = this.chunks.values().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
Chunk chunk = (Chunk) iterator.next(); Chunk chunk = (Chunk) iterator.next();
@@ -266,7 +273,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -266,7 +274,7 @@ public class ChunkProviderServer implements IChunkProvider {
this.saveChunk(chunk); this.saveChunk(chunk);
chunk.f(false); chunk.f(false);
++i; ++i;