mmo-ref/mc-paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper synced 2026-08-20 18:26:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add maximum time to wait for channels to close (#14126)

Browse source
This commit is contained in:
Warrior 2026-08-07 09:02:57 +02:00 • committed by GitHub
parent 1f7285664c
commit ae22db2692
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

46
paper-server/patches/sources/net/minecraft/server/network/ServerConnectionListener.java.patch
View file

@ -100,6 +100,34 @@
public SocketAddress startMemoryChannel() {
ChannelFuture newChannel;
synchronized (this.channels) {
@@ -157,9 +_,26 @@
public void stop() {
this.running = false;
+ // Paper start - Add maximum time to wait for channels to close
+ for (final ChannelFuture channel : this.channels) {
+ channel.channel().close();
+ }
+
+ final long startTime = System.currentTimeMillis();
+ // Paper end - Add maximum time to wait for channels to close
for (ChannelFuture channel : this.channels) {
try {
- channel.channel().close().sync();
+ // Paper start - Add maximum time to wait for channels to close
+ final ChannelFuture closeFuture = channel.channel().closeFuture();
+ if (!closeFuture.await(30_000 - (System.currentTimeMillis() - startTime), TimeUnit.MILLISECONDS)) {
+ LOGGER.error("Timed out whilst waiting for channel to close");
+ }
+
+ // Need to manually throw to match how ChannelFuture#sync throws
+ if (closeFuture.state() == ChannelFuture.State.FAILED) {
+ com.destroystokyo.paper.util.SneakyThrow.sneaky(closeFuture.exceptionNow());
+ }
+ // Paper end - Add maximum time to wait for channels to close
} catch (InterruptedException ignored) {
LOGGER.error("Interrupted whilst closing channel");
}
@@ -187,12 +_,26 @@
public void tick() {
@ -135,17 +163,29 @@
iterator.remove();
connection.handleDisconnection();
}
@@ -219,6 +_,16 @@
@@ -219,6 +_,28 @@
}
}
}
+ // Paper start
+ public void handleAllDisconnections() {
+ synchronized (this.connections) {
+ // Paper start - Add maximum time to wait for channels to close
+ for (final Connection connection : this.connections) {
+ connection.channel.close().awaitUninterruptibly();
+ connection.handleDisconnection();
+ connection.channel.close();
+ }
+
+ final long startTime = System.currentTimeMillis();
+ for (final Connection connection : this.connections) {
+ final ChannelFuture closeFuture = connection.channel.closeFuture();
+
+ if (closeFuture.awaitUninterruptibly(30_000 - (System.currentTimeMillis() - startTime))) {
+ connection.handleDisconnection();
+ } else {
+ LOGGER.error("Timed out whilst waiting for player connection channel to close");
+ }
+ }
+ // Paper end - Add maximum time to wait for channels to close
+ }
+ }
+ // Paper end