Paper/patches/server/0158-revert-serverside-behavior-of-keepalives.patch

74 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Oct 2017 00:29:07 +0100
Subject: [PATCH] revert serverside behavior of keepalives
This patch intends to bump up the time that a client has to reply to the
server back to 30 seconds as per pre 1.12.2, which allowed clients
more than enough time to reply potentially allowing them to be less
tempermental due to lag spikes on the network thread, e.g. that caused
by plugins that are interacting with netty.
We also add a system property to allow people to tweak how long the server
will wait for a reply. There is a compromise here between lower and higher
values, lower values will mean that dead connections can be closed sooner,
whereas higher values will make this less sensitive to issues such as spikes
from networking or during connections flood of chunk packets on slower clients,
at the cost of dead connections being kept open for longer.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2022-06-07 22:45:38 +02:00
index 8665bbd6e81d55711f82419c3e3edc9357a839f9..fb681f9607f2b17a5edafc60c40342532e33021c 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2022-06-07 22:45:38 +02:00
@@ -239,7 +239,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
2021-06-11 14:02:28 +02:00
public ServerPlayer player;
private int tickCount;
2022-06-07 22:45:38 +02:00
private int ackBlockChangesUpTo = -1;
- private long keepAliveTime;
2021-06-12 14:58:17 +02:00
+ private long keepAliveTime = Util.getMillis();
2022-06-07 22:45:38 +02:00
private boolean keepAlivePending;
private long keepAliveChallenge;
2021-06-11 14:02:28 +02:00
// CraftBukkit start - multithreaded fields
2022-06-07 22:45:38 +02:00
@@ -272,6 +272,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
2021-06-11 14:02:28 +02:00
private int knownMovePacketCount;
2022-06-07 22:45:38 +02:00
private final ChatPreviewThrottler chatPreviewThrottler = new ChatPreviewThrottler();
private final AtomicReference<Instant> lastChatTimeStamp;
2021-06-11 14:02:28 +02:00
+ private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
2022-06-07 22:45:38 +02:00
this.lastChatTimeStamp = new AtomicReference(Instant.EPOCH);
@@ -359,18 +360,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
2021-06-11 14:02:28 +02:00
}
this.server.getProfiler().push("keepAlive");
- long i = Util.getMillis();
-
- if (i - this.keepAliveTime >= 25000L) { // CraftBukkit
- if (this.keepAlivePending) {
2022-06-07 22:45:38 +02:00
- this.disconnect(Component.translatable("disconnect.timeout"));
2021-06-11 14:02:28 +02:00
- } else {
+ // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
+ // This should effectively place the keepalive handling back to "as it was" before 1.12.2
+ long currentTime = Util.getMillis();
2021-06-12 14:58:17 +02:00
+ long elapsedTime = currentTime - this.keepAliveTime;
2021-06-11 14:02:28 +02:00
+
2021-06-12 14:58:17 +02:00
+ if (this.keepAlivePending) {
2021-06-11 14:02:28 +02:00
+ if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
+ ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
2022-06-07 22:45:38 +02:00
+ this.disconnect(Component.translatable("disconnect.timeout", new Object[0]));
2021-06-11 14:02:28 +02:00
+ }
+ } else {
+ if (elapsedTime >= 15000L) { // 15 seconds
2021-06-12 14:58:17 +02:00
this.keepAlivePending = true;
- this.keepAliveTime = i;
- this.keepAliveChallenge = i;
+ this.keepAliveTime = currentTime;
+ this.keepAliveChallenge = currentTime;
this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
2021-06-11 14:02:28 +02:00
}
}
+ // Paper end
this.server.getProfiler().pop();
// CraftBukkit start