2018-12-13 01:40:29 +01:00
From cf6a10fd06d8de714535f84169f67871c80f0f6f Mon Sep 17 00:00:00 2001
2016-09-22 04:12:56 +02:00
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Sep 2016 23:16:39 -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.
2016-12-27 22:11:25 +01:00
Adds incremental player auto saving too
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2018-12-13 01:40:29 +01:00
index 51b0dd972..9f8b43d2a 100644
2016-12-27 22:11:25 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2018-10-19 02:44:59 +02:00
@@ -269,4 +269,15 @@ public class PaperConfig {
2016-12-27 22:11:25 +01:00
flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
}
+
+ public static int playerAutoSaveRate = -1;
2018-03-05 02:20:27 +01:00
+ public static int maxPlayerAutoSavePerTick = 10;
2016-12-27 22:11:25 +01:00
+ private static void playerAutoSaveRate() {
+ playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1);
2018-03-05 02:20:27 +01:00
+ maxPlayerAutoSavePerTick = getInt("settings.max-player-auto-save-per-tick", -1);
+ if (maxPlayerAutoSavePerTick == -1) { // -1 Automatic / "Recommended"
+ // 10 should be safe for everyone unless your mass spamming player auto save
+ maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
+ }
2016-12-27 22:11:25 +01:00
+ }
}
2016-09-22 04:12:56 +02:00
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2018-12-13 01:40:29 +01:00
index d8f258105..47bfb5b62 100644
2016-09-22 04:12:56 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
import java.util.List;
+import net.minecraft.server.MinecraftServer;
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
2017-05-14 20:05:01 +02:00
2018-12-13 01:40:29 +01:00
@@ -315,4 +316,19 @@ public class PaperWorldConfig {
2018-07-16 22:08:09 +02:00
private void skipEntityTickingInChunksScheduledForUnload() {
skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
2016-09-22 04:12:56 +02:00
}
+
+ 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
2018-12-13 01:40:29 +01:00
index 2a9bfd7af..2af8a582b 100644
2016-09-22 04:12:56 +02:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
2018-10-23 01:16:21 +02:00
@@ -49,9 +49,9 @@ public class Chunk implements IChunkAccess {
2018-08-26 20:11:49 +02:00
private final TickList<Block> s;
private final TickList<FluidType> t;
private boolean u;
- private boolean v;
+ private boolean v;public boolean hasEntities() { return v; } // Paper - OBFHELPER
2018-07-21 22:03:10 +02:00
private long lastSaved;
2018-08-26 20:11:49 +02:00
- private boolean x;
+ private boolean x; public boolean isModified() { return x; } // Paper - OBFHELPER
private int y;
private long z;
private int A;
2018-10-23 01:16:21 +02:00
@@ -1059,11 +1059,11 @@ public class Chunk implements IChunkAccess {
2018-08-26 20:11:49 +02:00
if (this.v && this.world.getTime() != this.lastSaved || this.x) {
2016-09-22 04:12:56 +02:00
return true;
}
2018-08-26 20:11:49 +02:00
- } else if (this.v && this.world.getTime() >= this.lastSaved + MinecraftServer.getServer().autosavePeriod * 4) { // Spigot - Only save if we've passed 2 auto save intervals without modification
2016-11-04 06:31:49 +01:00
- return true;
2016-09-22 04:12:56 +02:00
}
2016-11-04 06:31:49 +01:00
-
2018-08-26 20:11:49 +02:00
- return this.x;
2018-07-21 22:03:10 +02:00
+ // Paper start - Make world configurable and incremental
+ // This !flag section should say if isModified or hasEntities, then check auto save
+ return ((isModified() || hasEntities()) && this.world.getTime() >= this.lastSaved + world.paperConfig.autoSavePeriod);
+ // Paper end
2016-11-04 06:31:49 +01:00
}
2016-09-22 04:12:56 +02:00
2018-07-16 22:08:09 +02:00
public boolean isEmpty() {
2016-09-22 04:12:56 +02:00
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
2018-12-08 11:09:55 +01:00
index 516a583a8..27bed54d2 100644
2016-09-22 04:12:56 +02:00
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
2018-12-08 11:09:55 +01:00
@@ -243,7 +243,7 @@ public class ChunkProviderServer implements IChunkProvider {
2018-08-26 20:11:49 +02:00
this.saveChunk(chunk, false); // Spigot
chunk.a(false);
++i;
- if (i == 24 && !flag && false) { // Spigot
+ if (!flag && i >= world.paperConfig.maxAutoSaveChunksPerTick) { // Spigot - // Paper - Incremental Auto Save - cap max
return false;
}
2016-09-22 04:12:56 +02:00
}
2016-12-27 22:11:25 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
2018-12-08 11:09:55 +01:00
index 3e4c80e0f..8506fad6f 100644
2016-12-27 22:11:25 +01:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2018-08-26 20:11:49 +02:00
@@ -37,6 +37,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2018-07-16 22:08:09 +02:00
private static final Logger cc = LogManager.getLogger();
public String locale = null; // CraftBukkit - lowercase // Paper - default to null
2016-12-27 22:11:25 +01:00
+ public long lastSave = MinecraftServer.currentTick; // Paper
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
2016-09-22 04:12:56 +02:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2018-12-08 11:09:55 +01:00
index bdf4aed1a..acdfb0e1e 100644
2016-09-22 04:12:56 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2018-09-08 05:49:37 +02:00
@@ -148,6 +148,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
2018-07-21 22:03:10 +02:00
public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
public ConsoleReader reader;
public static int currentTick = 0; // Paper - Further improve tick loop
+ public boolean serverAutoSave = false; // Paper
public final Thread primaryThread;
2016-09-26 07:50:26 +02:00
public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
public int autosavePeriod;
2018-09-18 04:32:37 +02:00
@@ -942,22 +943,30 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
2018-08-26 20:11:49 +02:00
this.m.b().a(agameprofile);
2016-09-22 04:12:56 +02:00
}
- if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
this.methodProfiler.a("save");
2018-07-16 22:08:09 +02:00
- this.s.savePlayers();
2016-09-22 04:12:56 +02:00
+
2016-09-26 07:50:26 +02:00
+ serverAutoSave = (autosavePeriod > 0 && this.ticks % autosavePeriod == 0); // Paper
2016-12-27 22:11:25 +01:00
+ int playerSaveInterval = com.destroystokyo.paper.PaperConfig.playerAutoSaveRate;
+ if (playerSaveInterval < 0) {
+ playerSaveInterval = autosavePeriod;
+ }
+ if (playerSaveInterval > 0) { // CraftBukkit // Paper
2018-07-16 22:08:09 +02:00
+ this.s.savePlayers(playerSaveInterval);
2016-09-22 04:12:56 +02:00
// 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;
2018-08-26 20:11:49 +02:00
for (World world : getWorlds()) {
2016-09-22 04:12:56 +02:00
- 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
2018-07-16 22:08:09 +02:00
this.methodProfiler.e();
2016-09-22 04:12:56 +02:00
- }
+ //} // Paper - Incremental Auto Saving
2018-07-16 22:08:09 +02:00
this.methodProfiler.a("snooper");
2018-08-26 20:11:49 +02:00
if (getSnooperEnabled() && !this.i.d() && this.ticks > 100) { // Spigot
2016-12-27 22:11:25 +01:00
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2018-12-08 11:09:55 +01:00
index 143c7c1be..1259ec9d6 100644
2016-12-27 22:11:25 +01:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2018-10-03 21:19:35 +02:00
@@ -342,6 +342,7 @@ public abstract class PlayerList {
2016-12-27 22:11:25 +01:00
protected void savePlayerFile(EntityPlayer entityplayer) {
2018-10-03 21:19:35 +02:00
if (!entityplayer.getBukkitEntity().isPersistent()) return; // CraftBukkit
2016-12-27 22:11:25 +01:00
+ entityplayer.lastSave = MinecraftServer.currentTick; // Paper
this.playerFileData.save(entityplayer);
2017-07-17 02:36:27 +02:00
ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
2016-12-27 22:11:25 +01:00
2018-10-03 21:19:35 +02:00
@@ -1208,13 +1209,25 @@ public abstract class PlayerList {
2016-12-27 22:11:25 +01:00
}
+ // Paper start
public void savePlayers() {
+ savePlayers(null);
+ }
+
+ public void savePlayers(Integer interval) {
+ long now = MinecraftServer.currentTick;
MinecraftTimings.savePlayers.startTiming(); // Paper
2018-03-05 02:20:27 +01:00
+ int numSaved = 0; // Paper
2016-12-27 22:11:25 +01:00
for (int i = 0; i < this.players.size(); ++i) {
- this.savePlayerFile((EntityPlayer) this.players.get(i));
+ EntityPlayer entityplayer = this.players.get(i);
+ if (interval == null || now - entityplayer.lastSave >= interval) {
+ this.savePlayerFile(entityplayer);
2018-03-05 02:20:27 +01:00
+ if (interval != null && ++numSaved <= com.destroystokyo.paper.PaperConfig.maxPlayerAutoSavePerTick) { break; } // Paper
2016-12-27 22:11:25 +01:00
+ }
}
MinecraftTimings.savePlayers.stopTiming(); // Paper
}
+ // Paper end
2018-07-16 22:08:09 +02:00
public WhiteList getWhitelist() {
return this.whitelist;
2016-09-22 04:12:56 +02:00
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
2018-12-08 11:09:55 +01:00
index b37b284a5..6a5a7d1e0 100644
2016-09-22 04:12:56 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2018-07-16 22:08:09 +02:00
@@ -872,8 +872,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
2016-09-22 04:12:56 +02:00
ChunkProviderServer chunkproviderserver = this.getChunkProviderServer();
2018-08-26 20:11:49 +02:00
if (chunkproviderserver.d()) {
2016-09-22 04:12:56 +02:00
- org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
+ if (flag) org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit // Paper - Incremental Auto Saving - Only fire event on full save
2016-10-21 22:42:49 +02:00
timings.worldSave.startTiming(); // Paper
+ if (flag || server.serverAutoSave) { // Paper
2016-09-22 04:12:56 +02:00
if (iprogressupdate != null) {
2018-07-16 22:08:09 +02:00
iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
2016-09-22 04:12:56 +02:00
}
2018-07-16 22:08:09 +02:00
@@ -882,6 +883,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
2016-09-26 07:50:26 +02:00
if (iprogressupdate != null) {
2018-07-16 22:08:09 +02:00
iprogressupdate.c(new ChatMessage("menu.savingChunks", new Object[0]));
2016-09-26 07:50:26 +02:00
}
2016-10-21 22:42:49 +02:00
+ } // Paper
timings.worldSaveChunks.startTiming(); // Paper
chunkproviderserver.a(flag);
2016-09-22 04:12:56 +02:00
--
2018-12-13 01:40:29 +01:00
2.20.0
2016-09-22 04:12:56 +02:00