fix(console): stop headless servers from pegging a CPU core (#2535)
## Problem On headless Linux deployments (systemd service, Docker without a TTY, `nohup`), the ModernUO process pegs a full CPU core even when idle. It does not reproduce on Windows because that runs with an interactive console. ## Root cause `ConsoleInputHandler` runs a background thread (named "Console Input Handler") that loops on `Console.ReadLine()`. When stdin is **not** an interactive terminal, `Console.ReadLine()` returns `null` at end-of-stream **immediately** on every call, so the loop `continue`s in a tight spin — one core at 100%. Reproduced in a container running the actual distribution: the "Console Input Handler" thread sat at ~90% CPU on a headless boot; with a blocking stdin it dropped to idle. ## Fix 1. **Detect headless once at startup:** `Core.Headless = Console.IsInputRedirected`. 2. **Extract a testable `ConsoleInputPump`** that owns the input stream: per line read, it *atomically* (under one lock) either delivers the line to a waiting prompt or dispatches a console command, and it **ends on EOF instead of spinning**. Cleanup runs unconditionally in a `finally`, so a pending prompt is always released (never hangs). Replaces the old `async void` loop and the fragile `_expectUserInput` / two-`AutoResetEvent` / `_input` handshake. 3. **`ConsoleInputHandler` becomes a thin headless-aware facade** over the pump. Headless: the reader thread never starts (`Console input disabled (headless: stdin is not a TTY).`), and `ReadLine()` throws a fatal `HeadlessConsoleInputException`. 4. **Data-gating and first-boot prompts** (deserialization "delete bad types? y/n", save-conflict, config/expansion setup) now route through `ConsoleInputHandler.ReadLine()`, so a headless server crashes fatal with a clear message instead of reading `null` (previously an NRE or a silent wrong branch). Design decision (model b): headless servers are expected to be supplied with configuration/save data (including the owner account); interactive prompts when headless are fatal by design. ## Testing - New `ConsoleInputPumpTests` (5 tests): EOF ends the loop without spinning; command dispatch; a pending prompt receives the next line; EOF while a prompt is pending completes it with `null` (no hang); a throwing command lookup does not hang a pending prompt. The tests synchronize on real pump state (no `Thread.Sleep`), so they are deterministic on slow CI. - Full `Server.Tests`: no new failures introduced. ## End-to-end verification (Docker, real distribution) | | Console Input Handler thread | Container CPU | |---|---|---| | Before fix (headless boot) | ~90% | ~199% (2 cores) | | After fix (headless boot) | **not started** | **~11%** | After the fix, a headless boot logs `Console input disabled (headless: stdin is not a TTY).`, loads the world normally, and idles instead of spinning.
This commit is contained in:
parent
f4a771c19d
commit
7434ed7ee1
9 changed files with 354 additions and 74 deletions
|
|
@ -147,6 +147,8 @@ public static class Core
|
|||
|
||||
public static bool Closing => ClosingTokenSource.IsCancellationRequested;
|
||||
|
||||
public static bool Headless { get; private set; }
|
||||
|
||||
public static int GlobalUpdateRange { get; set; } = 18;
|
||||
|
||||
public static int GlobalMaxUpdateRange { get; set; } = 24;
|
||||
|
|
@ -258,7 +260,7 @@ public static class Core
|
|||
// ignored
|
||||
}
|
||||
|
||||
if (!close)
|
||||
if (!close && !Core.Headless)
|
||||
{
|
||||
Console.WriteLine("This exception is fatal, press return to exit");
|
||||
ConsoleInputHandler.ReadLine();
|
||||
|
|
@ -407,6 +409,12 @@ public static class Core
|
|||
|
||||
Console.CancelKeyPress += Console_CancelKeyPressed;
|
||||
|
||||
Headless = Console.IsInputRedirected;
|
||||
if (Headless)
|
||||
{
|
||||
logger.Information("Headless mode detected (stdin is not a TTY); interactive console input is disabled.");
|
||||
}
|
||||
|
||||
// LibDeflate is not thread safe, so we need to create a new instance for each thread
|
||||
var standard = Deflate.Standard;
|
||||
AppDomain.CurrentDomain.ProcessExit += (_, _) => standard.Dispose();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue