From 6c7ea0b67afd84e5fc92a4de7b05ad8c0da0dc06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:12:56 -0400 Subject: [PATCH] Auto Save Improvements Makes Auto Save Rate setting configurable per-world. If the auto save rate is left -1, the global bukkit.yml value will be used. Process auto save every tick instead of once per auto tick interval, so that chunk saves will distribute over many ticks instead of all at once. Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and make it configurable. --- ...ing.patch => Auto-Save-Improvements.patch} | 73 +++++++++++++++++-- 1 file changed, 67 insertions(+), 6 deletions(-) rename Spigot-Server-Patches/{Incremental-Auto-Saving.patch => Auto-Save-Improvements.patch} (54%) diff --git a/Spigot-Server-Patches/Incremental-Auto-Saving.patch b/Spigot-Server-Patches/Auto-Save-Improvements.patch similarity index 54% rename from Spigot-Server-Patches/Incremental-Auto-Saving.patch rename to Spigot-Server-Patches/Auto-Save-Improvements.patch index 0e03fdd5d2..60ff5a51a1 100644 --- a/Spigot-Server-Patches/Incremental-Auto-Saving.patch +++ b/Spigot-Server-Patches/Auto-Save-Improvements.patch @@ -1,10 +1,46 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 -Subject: [PATCH] Incremental Auto Saving +Subject: [PATCH] Auto Save Improvements + +Makes Auto Save Rate setting configurable per-world. If the auto save rate is left -1, the global bukkit.yml value will be used. Process auto save every tick instead of once per auto tick interval, so that chunk saves will distribute over many ticks instead of all at once. +Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and make it configurable. + +diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +@@ -0,0 +0,0 @@ package com.destroystokyo.paper; + + import java.util.List; + ++import net.minecraft.server.MinecraftServer; + import org.bukkit.Bukkit; + import org.bukkit.configuration.file.YamlConfiguration; + import org.spigotmc.SpigotWorldConfig; +@@ -0,0 +0,0 @@ public class PaperWorldConfig { + private void elytraHitWallDamage() { + elytraHitWallDamage = getBoolean("elytra-hit-wall-damage", true); + } ++ ++ public int autoSavePeriod = -1; ++ private void autoSavePeriod() { ++ autoSavePeriod = getInt("auto-save-interval", -1); ++ if (autoSavePeriod > 0) { ++ log("Auto Save Interval: " +autoSavePeriod + " (" + (autoSavePeriod / 20) + "s)"); ++ } else if (autoSavePeriod < 0) { ++ autoSavePeriod = MinecraftServer.getServer().autosavePeriod; ++ } ++ } ++ ++ public int maxAutoSaveChunksPerTick = 24; ++ private void maxAutoSaveChunksPerTick() { ++ maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24); ++ } + } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/Chunk.java @@ -14,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return true; } - } else if (this.t && this.world.getTime() >= this.lastSaved + MinecraftServer.getServer().autosavePeriod * 4) { // Spigot - Only save if we've passed 2 auto save intervals without modification -+ } else if (this.t && this.world.getTime() >= this.lastSaved + MinecraftServer.getServer().autosavePeriod) { // Spigot // Paper - Remove broken change ++ } else if (this.t && this.world.getTime() >= this.lastSaved + world.paperConfig.autoSavePeriod) { // Spigot // Paper - Make world configurable and incremental return true; } @@ -22,12 +58,19 @@ diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/m index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +@@ -0,0 +0,0 @@ + package net.minecraft.server; + ++import com.destroystokyo.paper.PaperConfig; + import com.google.common.collect.Lists; + import com.google.common.collect.Sets; + import it.unimi.dsi.fastutil.longs.Long2ObjectMap; @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider { this.saveChunk(chunk); chunk.f(false); ++i; - if (i == 24 && !flag && false) { // Spigot -+ if (i == 24 && !flag) { // Spigot - // Paper - Incremental Auto Save - cap to 24 per tick ++ if (!flag && i >= world.paperConfig.maxAutoSaveChunksPerTick) { // Spigot - // Paper - Incremental Auto Save - cap max per tick return false; } } @@ -40,14 +83,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } - if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit -+ if (autosavePeriod > 0 /*&& this.ticks % autosavePeriod == 0*/) { // CraftBukkit // Paper - Incremental Auto Saving MinecraftTimings.worldSaveTimer.startTiming(); // Spigot this.methodProfiler.a("save"); -- this.v.savePlayers(); -+ if (this.ticks % autosavePeriod == 0) this.v.savePlayers(); // Paper - Incremental Auto Saving ++ ++ if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit + this.v.savePlayers(); // Spigot Start ++ } // Paper - Incremental Auto Saving ++ // We replace this with saving each individual world as this.saveChunks(...) is broken, // and causes the main thread to sleep for random amounts of time depending on chunk activity + // Also pass flag to only save modified chunks + server.playerCommandState = true; + for (World world : worlds) { +- world.getWorld().save(false); ++ if (world.paperConfig.autoSavePeriod > 0) world.getWorld().save(false); // Paper - Incremental / Configurable Auto Saving + } + server.playerCommandState = false; + // this.saveChunks(true); + // Spigot End + this.methodProfiler.b(); + MinecraftTimings.worldSaveTimer.stopTiming(); // Spigot +- } ++ //} // Paper - Incremental Auto Saving + + this.methodProfiler.a("tallying"); + this.h[this.ticks % 100] = System.nanoTime() - i; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java