Skip to content

Isolate exceptions in processTrackQueueInParallel/flushQueueInParallel #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mliem2k wants to merge 1 commit into
base: ver/26.2
Choose a base branch
from
Open

Isolate exceptions in processTrackQueueInParallel/flushQueueInParallel #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...-server/src/main/java/io/multipaper/shreddedpaper/threading/ShreddedPaperChunkTicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ private CompletableFuture<Void> processTrackQueueInParallel(ServerLevel level) {
}

allFuture = allFuture.thenCompose(v -> CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)));
return allFuture;
return allFuture.exceptionally(e -> {
LOGGER.error("Exception processing tracked entities in parallel", e);
MinecraftServer.getServer().moonrise$setChunkSystemCrash(new RuntimeException("Ticking thread crash while processing tracked entities in parallel", e));
return null;
});
} finally {
allFuture.whenComplete((v, e) -> level.chunkScheduler.getRegionLocker().globalLock().tryUnlockWrite());
}
Expand All @@ -89,7 +93,11 @@ private CompletableFuture<Void> flushQueueInParallel(ServerLevel level) {
futures.add(CompletableFuture.runAsync(() -> players.forEach(player -> player.connection.connection.flushQueue()), ShreddedPaperTickThread.getExecutor()));
}

return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new));
return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).exceptionally(e -> {
LOGGER.error("Exception flushing packet queues in parallel", e);
MinecraftServer.getServer().moonrise$setChunkSystemCrash(new RuntimeException("Ticking thread crash while flushing packet queues in parallel", e));
return null;
});
}

private CompletableFuture<Void> tickRegion(final ServerLevel level, final LevelChunkRegion region, final long timeInhabited, final List<MobCategory> filteredSpawningCategories, final NaturalSpawner.SpawnState spawnState) {
Expand Down