Follow up to PR #41512

[Feng Wang (chemwolf6922)]

Summary of the Pull Request

This is a follow up to PR #41512

1. Remove the redundant restore cgroup namespace code.
2. Simplify the cgroup check logic by moving the retry inside the debug shell.
3. Add a new systemd boot timeout test.

PR Checklist

• Closes: Link to issue #xxx
• Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
• Tests: Added/updated if needed and all pass
• Localization: All end user facing strings can be localized
• Dev docs: Added/updated if needed
• Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Add / modified tests:
UnitTests::UnitTests::SystemdBootTimeout
UnitTests::UnitTests::IsolatedCgroupLayout
UnitTests::UnitTests::IsolatedCgroupLayoutSystemd
UnitTests::UnitTests::IsolatedCgroupLayoutOverridesV1

[Copilot]

🟡 Changes recommended

The reviewed changes contain an unresolved build failure and a test cleanup failure risk.

Get a fresh assessment by requesting another Copilot review.

Pull request overview

This follow-up simplifies cgroup cleanup handling and adds systemd boot-timeout regression coverage.

Changes:

• Moves cgroup cleanup retry logic into the debug shell.
• Removes redundant cgroup namespace restoration.
• Adds SystemdBootTimeout coverage.

File summaries

File	Summary
test/windows/UnitTests.cpp	Adds timeout coverage and updates cgroup cleanup validation; keep-alive reset may fail after VM shutdown (moderate, 1 vote).
src/linux/init/init.cpp	Removes namespace restoration but leaves an unused variable, causing a -Wall -Werror build failure (critical, 1 vote).

Review details

Suppressed comments (1)

test/windows/UnitTests.cpp:8172

• The guest script powers off the VM while keepAlive2 is still active, but the next line calls WslKeepAlive::Reset(). That method unconditionally writes to the keep-alive process's stdin and throws on a broken pipe (test/windows/Common.cpp:1217-1224), so once the forced shutdown terminates that wsl.exe process this test can fail during cleanup. Avoid resetting a keep-alive after tearing down its VM, or make the cleanup tolerate an already-terminated process.

        keepAlive2.Reset();

• Files reviewed: 2/2 changed files
• Comments generated: 1
• Review effort level: Lite

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[Copilot]

Copilot review overview

🟡 Changes recommended

The namespace restore failure path and forced-shutdown test cleanup issue remain unresolved.

Get a fresh assessment by requesting another Copilot review.

Review effort: Lite
Findings: 1

Open (1)

• Propagate failure when restoring the original cgroup namespace · New

Resolved since last review (1)

• Removing the scope-exit below leaves OriginalCgroupNamespace with no remaining use. The Linux…

[Copilot]

Copilot review overview

🟢 Approval recommended

The changes are focused, consistent with existing behavior, and adequately tested.

Review effort: Balanced
Findings: None

Resolved since last review (1)

• Propagate failure when restoring the original cgroup namespace