Skip to content

Wslc events - #40971

Merged
beena352 merged 61 commits into
microsoft:masterfrom
kvega005:wslcEvents
Sep 3, 2026
Merged

beena352 merged 61 commits into
microsoft:masterfrom
kvega005:wslcEvents

Conversation

@kvega005

Copy link
Copy Markdown
Contributor

Summary of the Pull Request

Adds a docker events style event stream to the WSLC session. A new IWSLCEventStream COM interface and IWSLCSession::GetEvents let callers subscribe to container lifecycle events (create, start, kill, stop, destroy), filtered by time window and key/value filters, pulled one JSON event at a time. Events are backed by a new bounded in-memory ring (EventStore) fed from Docker's own event stream.

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

Copilot AI lite review requested due to automatic review settings July 1, 2026 22:49

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds a Docker-like event streaming capability to the WSLC session so clients can subscribe to container lifecycle events over a new COM stream interface, backed by a bounded in-memory event ring shared across subscribers.

Changes:

  • Introduces IWSLCEventStream and IWSLCSession::GetEvents for pull-based, filtered event consumption over a time window.
  • Implements an EventStore ring buffer and wires event recording from Docker container lifecycle notifications.
  • Extends SDK/IDL/package/localization assets and adds new end-to-end tests for event streaming behavior.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
test/windows/WSLCTests.cpp Adds tests for event stream ordering/filtering and termination-unblocks-reader behavior.
src/windows/wslcsession/WSLCSession.h Declares GetEvents and adds EventStore as a session member.
src/windows/wslcsession/WSLCSession.cpp Implements WSLCSession::GetEvents and triggers event-store termination wake on session terminate.
src/windows/wslcsession/WSLCContainer.h Plumbs EventStore into container implementation and clarifies timestamp units.
src/windows/wslcsession/WSLCContainer.cpp Records create/start/kill/stop/destroy lifecycle events into EventStore.
src/windows/wslcsession/EventStore.h Adds EventStore + EventStream COM runtime class definitions.
src/windows/wslcsession/EventStore.cpp Implements bounded ring buffering, filtering, and blocking GetNext behavior.
src/windows/wslcsession/DockerEventTracker.h Adds Kill to tracked container events.
src/windows/wslcsession/DockerEventTracker.cpp Maps Docker "kill" action to the new ContainerEvent::Kill.
src/windows/wslcsession/CMakeLists.txt Adds EventStore sources/headers to the build.
src/windows/WslcSDK/wslcsdk.h Adds new HRESULTs for events-lost and stream-finished conditions.
src/windows/service/inc/wslc.idl Adds IWSLCEventStream and IWSLCSession::GetEvents to the COM contract.
src/windows/inc/wslc_schema.h Adds JSON schema structs for event serialization/deserialization.
msipackage/package.wix.in Registers the new COM interface IID for proxy/stub.
localization/strings/en-US/Resources.resw Adds a localized user-facing message for invalid event time windows.
Comments suppressed due to low confidence (3)

test/windows/WSLCTests.cpp:5859

  • until is captured before RunningWSLCContainer goes out of scope; its destructor calls Delete(...) which is what triggers Docker's destroy event. That can place the destroy event outside the [since, until] window, making this test flaky (and causing events[4].time <= until to fail intermittently). Capture until after the container is deleted (after the scope), so the window includes the destroy timestamp.
            launcher.AddTmpfs("relative-path", "");

            auto [hresult, container] = launcher.LaunchNoThrow(*m_defaultSession);
            VERIFY_ARE_EQUAL(hresult, E_FAIL);

test/windows/WSLCTests.cpp:5930

  • This test can hang indefinitely on failure: if GetNext doesn't unblock, future.get() will block, and the unconditional readerThread.join() in the scope-exit will also block (including during stack unwinding after a VERIFY failure). Prefer joining only after confirming readiness, and detach + fail when the timeout elapses so the test fails fast instead of wedging the suite.
            VERIFY_SUCCEEDED(container->Delete(WSLCDeleteFlagsNone));
        }

        // Validate that invalid tty sizes are rejected.
        {

src/windows/service/inc/wslc.idl:554

  • The comment says the returned JSON matches Docker's events --format json shape including timeNano, but the current wslc_schema::Event only defines Type, Action, Actor, and time (no timeNano). The comment also doesn't document the completion/loss HRESULTs that callers must handle. Update the IDL comment to match the actual schema and to mention WSLC_E_EVENT_STREAM_FINISHED/WSLC_E_EVENTS_LOST (and E_ABORT on termination).
    [unique, size_is(ContainersCount)] WSLCContainerId* Containers;
    ULONG ContainersCount;
    ULONGLONG SpaceReclaimed;
} WSLCPruneContainersResults;

Comment thread src/windows/wslcsession/EventStore.cpp Outdated
Comment thread src/windows/wslcsession/EventStore.cpp Outdated
Copilot AI review requested due to automatic review settings July 1, 2026 22:55
Copilot AI review requested due to automatic review settings September 1, 2026 18:33

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 16 out of 16 changed files in this pull request and generated 2 comments.

Suppressed comments (1)

src/windows/wslcsession/EventStore.cpp:193

  • const auto event = GetLockHeld(...).value(); incurs an extra deep copy of Event (and its Attributes map): once into the optional returned by GetLockHeld(), then again into event. You can keep the optional in a local and std::move its value to avoid that second copy.
        const auto event = GetLockHeld(SequenceNumber.value()).value();
Comment thread src/windows/wslcsession/EventStore.cpp Outdated
Comment thread test/windows/WSLCTests.cpp
THROW_HR(WSLC_E_EVENTS_LOST);
}

if (!WaitForEvent(lock, SequenceNumber.value(), Until))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does GetNext() need to be serialized with a per-stream mutex or something? I am thinking concurrent GetNext() calls may end up corrupting the stream cursor? m_lock here will help preventing the cursor from being mutated simultaneously, but if two calls end up passing the same curosr value to WaitForEvent above, there could be a race and one of the streams could fail and cursot would be inconsistent

// Key the map by Docker's container ID, which is set in the WSLCContainerImpl constructor and stable for its lifetime.
auto [it, inserted] = m_containers.emplace(container->ID(), std::move(container));
WI_ASSERT(inserted);
auto pendingCreate = StartPendingCreate(container);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, so the m_pendingCreate will only get cleared when the docker create event is processed.. but if that fails for whatever reason, it will wedge all the later creates? this shoudl be time-bound


if (Until.has_value())
{
if (!m_updated.wait_until(Lock, Until.value(), ready))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty large positive seconds could still overflow when wait_until() converts sys_seconds to the windows system_clock?

Comment thread src/windows/wslcsession/EventStore.cpp Outdated
#include "WSLCSession.h"
#include "WSLCExecutionContext.h"
#include <chrono>
#include "wslc_schema.h"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: doesn't seem like this include would be needed here.

#define WSLC_E_SESSION_NOT_FOUND MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, WSLC_E_BASE + 15) /* 0x8004060F */
#define WSLC_E_VM_NOT_RUNNING MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, WSLC_E_BASE + 16) /* 0x80040610 */
#define WSLC_E_EVENTS_LOST MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, WSLC_E_BASE + 17) /* 0x80040611 */
#define WSLC_E_EVENT_STREAM_FINISHED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, WSLC_E_BASE + 18) /* 0x80040612 */

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: should double-check these are present in error codes documentation and in g_commonErrors

Comment thread test/windows/WSLCTests.cpp Outdated
auto restore = ResetTestSession();

// Termination wakes the parked reader; it must finish quickly and report E_ABORT.
VERIFY_ARE_EQUAL(std::future_status::ready, future.wait_for(10s));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this 10s timeout does not bound the test, it will still go ahead and call future.get() and hang?

Comment thread test/windows/WSLCTests.cpp
// Termination wakes the parked reader; it must finish quickly and report E_ABORT.
VERIFY_ARE_EQUAL(std::future_status::ready, future.wait_for(10s));
VERIFY_ARE_EQUAL(E_ABORT, future.get());
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should likely have a test for what happens when a stream falls behind, given the store retains only 256 events

Copilot AI review requested due to automatic review settings September 2, 2026 18:47

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

WSLCContainerImpl::OnEvent records Kill events without taking m_lock, creating a potential data race with other container operations/teardown.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Review details

Suppressed comments (1)

src/windows/wslcsession/WSLCContainer.cpp:1271

  • OnEvent() handles ContainerEvent::Kill by calling RecordEvent() without taking m_lock, but RecordEvent() reads members (e.g., m_labels, m_name, m_image, m_id) that are otherwise accessed under m_lock (e.g., GetLabels). This introduces a potential data race with concurrent state/lifecycle operations or teardown.
    if (event == ContainerEvent::Kill)
    {
        RecordEvent("kill", eventTime);
        return;
    }
  • Files reviewed: 19/19 changed files
  • Comments generated: 1
  • Review effort level: Lite
Comment on lines +7022 to +7023
// Docker emits a 'kill' event per signal. SIGWINCH is ignored by an unhandling init process, so the
// container keeps running and each signal costs only one event.
Copilot AI review requested due to automatic review settings September 2, 2026 18:56

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

It introduces a new COM API surface plus new concurrency-sensitive session/container eventing paths that warrant final human review despite only minor actionable nits.

Review details

Suppressed comments (2)

src/windows/wslcsession/EventStore.cpp:196

  • EventStore::Get() copies the entire Event (including the potentially large Actor.Attributes map) on every iteration via GetLockHeld(...).value(), even for events that are skipped by the time window or filters. This can add avoidable CPU/memory churn for busy streams.

Consider reading the buffered event by reference under m_lock and only copying when returning a matched event.

        const auto event = GetLockHeld(SequenceNumber.value()).value();
        const std::chrono::sys_seconds eventTime{std::chrono::seconds{event.time}};

test/windows/WSLCTests.cpp:7023

  • Typo in comment: “unhandling init process” should be “unhandled init process”.
        // Docker emits a 'kill' event per signal. SIGWINCH is ignored by an unhandling init process, so the
        // container keeps running and each signal costs only one event.
  • Files reviewed: 19/19 changed files
  • Comments generated: 0 new
  • Review effort level: Lite
Copilot AI review requested due to automatic review settings September 2, 2026 19:56

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

It introduces a new COM surface plus multi-threaded event-streaming and ordering coordination that should receive final human review for correctness and long-term supportability.

Review details
  • Files reviewed: 18/18 changed files
  • Comments generated: 0 new
  • Review effort level: Lite
@beena352
beena352 merged commit 75cd0f0 into microsoft:master Sep 3, 2026
11 checks passed
Blue (OneBlue) added a commit that referenced this pull request Sep 22, 2026
* Fix tracked routes being collapsed by incomplete comparison (#41393)

Mirrored route tracking used an incomplete comparator that considered only route class, destination address, and metric. Distinct routes with different prefix lengths or next hops could therefore be treated as equivalent and silently omitted.

The fix preserves the existing route-class ordering while using the complete EndpointRoute comparison for route identity. Regression tests cover prefix length, next hop, metric, exact duplicates, and dependency ordering.

* Add github issue suggestion in user visible error (#41432)

This PR adds a "search or file issue on github" suggestion in all user visible errors to:
Help users find solutions faster.
Collect more user reported issues to help reliability improvements.

This PR also updates all tests checking the error message to use a unified function for creating the expected error message.

* Match Docker output for prune operations and container inspection (#41430)

Cleanup various miscellaneous output divergences

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* CLI: Mount PR followup & fix two docker parser bugs (#41436)

* Invalid the TestImageRegistry cache after running prune --all (#41442)

* Fix unit test build failure on arm64 (#41437)

* Solve various issues found by verifier (#41445)

* Save state

* Save state

* Save state

* Cleanup diff

* Add a command line option to run the tests under verifier  (#41440)

* Save state

* Save state

* Save state

* Add a /verifier option to run-tests.ps1 to run the test under verifier

* Localization change from build: 155859879 (#41450)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Fix various arm64 test failures (#41444)

* Fix various arm64 test failures

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Fix LF

* Format

* Cleanup diff

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Fix unity build ODR collisions on duplicate file-local constants (#41446)

* CLI: Align alias listing with docker, Apple and other CLIs (#41439)

* Align container list format with Docker specifications (#41375)

wslc: match column order, status text, and json shape for container list


Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Localization change from build: 156161979 (#41479)

Co-authored-by: WSL localization <noreply@microsoft.com>

* wslc: alias -f to --format on inspect commands for docker parity (#41463)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* CLI: Add explicit per-command argument overrides (#41478)

* archlinux: Release 2026.09.01.176721 (#41493)

This is an automated release [1].

[1] https://gitlab.archlinux.org/archlinux/archlinux-wsl/-/blob/main/.gitlab-ci.yml

* Fix WSLC parser unit test argument overrides (#41496)

Update the remaining parser test call site to use ArgumentOverrides after the Argument::Create API change.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Copilot-Session: eb7946ff-cc0b-4ff1-a059-571334b1c988

* Fix systemd-tmpfiles failure on systemd v261+ with systemd boot disabled (#41491)

In systemd v261, the systemd's tmpfiles.d/x11.conf was changed from D! to D. systemd/systemd@5474cad.
This means the systemd-tmpfiles command will try to execute it when called out of the boot sequence. In the linked issue's case, it's called by the post install script by dpkg. This will fail as the wsl override is not in place when systemd is disabled.

This PR enables the wsl override file generation for all distros with wslg enabled, regardless of if the distro boots with systemd.

* Fix unvalidated TerminalProfileSize during distribution import (#41495)

* Fix unvalidated TerminalProfileSize when importing a distribution

_ProcessImportResultMessage constructed the terminal profile string_view
using the message-supplied TerminalProfileSize without validating it
against the received buffer length. Use the bounds-checked two-argument
span::subspan() overload (matching the existing ShortcutIconSize handling
a few lines above) so an inconsistent size value throws instead of
producing a string_view that runs past the end of the buffer.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 35281c30-3d08-4f05-8c84-2ce4711023d5

* format source

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 35281c30-3d08-4f05-8c84-2ce4711023d5

* Bump WSL DeviceHost to 1.2.62 (#41499)

* Bump WSL DeviceHost to 1.2.62

Co-authored-by: damanm24 <9593793+damanm24@users.noreply.github.com>

* Correct WSL DeviceHost version to 1.2.62-0

Co-authored-by: damanm24 <9593793+damanm24@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: damanm24 <9593793+damanm24@users.noreply.github.com>

* Enable unity build repo-wide via WSL_UNITY_BATCH_SIZE (#41441)

Enable unity build repo-wide via WSL_UNITY_BATCH_SIZE

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Add wslc system info command (#41408)

* updated source code paths in the wslservice tab (#41509)

Co-authored-by: Tega Ajise <tegaajise@Tegas-MacBook-Pro-2.local>

* Harden Windows macros against dangling-else ambiguity (#41513)

* Harden Windows macros against dangling-else ambiguity

* Harden Windows macros against dangling-else ambiguity

* Fix dangling-else bugs in FAIL_FAST_IF and EMIT_USER_WARNING macros (#41504)

* Fix dangling-else bugs in FAIL_FAST_IF and EMIT_USER_WARNING macros  

Both macros were bare if-statements without do/while(0) guards, causing
the dangling else problem when used as a single statement under an if.

* Fix dangling-else bugs in FAIL_FAST_IF and EMIT_USER_WARNING macros

* harden EMIT_USER_WARNING macro on Windows against dangling-else

* Fix dangling-else bugs in FAIL_FAST_IF and EMIT_USER_WARNING macros

* Fix intermittent ImportDistroInvalidTar test failures (#41490)

* Fix test to be more resilient

* Make WSL1 more lenient, make WSL2 exact

* Wslc events (#40971)

* Revert "Mount plugin folders on behalf of the user owning the wsl session" (#41331) (#41515)

Temporarily reverting the identity-based plugin folder mount change
(both the WslCoreVm.cpp behavior change and the accompanying
MountFolderAccess test coverage) introduced in #41331.

This reverts commit 78b9cf2.

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Add container restart runtime support (#41454)

* Fix p9 drvfs read only mount regression (#41487)

#41129 introduces a regression where the ";ro" option is passed to the host for p9 shares. However, that option is not supported by the p9 server and causes the mount to fail.

This PR removes the special handling of "ro" in the common parser. And use MountParseFlags to add the required virtio option.

* Fix WSLC Plan9 mount and image-build failures (#41535)

* Fix WSLC Plan9 mounts using a per-user server

* remove debug code

* wslc: add --size to inspect for docker parity (#41489)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Bump actions/deploy-pages in the github-actions group (#41537)

Bumps the github-actions group with 1 update: [actions/deploy-pages](https://github.com/actions/deploy-pages).


Updates `actions/deploy-pages` from 5.0.0 to 5.0.1
- [Release notes](https://github.com/actions/deploy-pages/releases)
- [Commits](actions/deploy-pages@cd2ce8f...368f825)

---
updated-dependencies:
- dependency-name: actions/deploy-pages
  dependency-version: 5.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add wslc container restart command (#41435)

* init: fix dhcpcd option name in bridged-mode config (#41538)

* init: fix dhcpcd option name in bridged-mode config

dhcpcd has no option named "broadcast"; option 28 is "broadcast_address".
dhcpcd 10 rejects the whole "option" line, so DNS servers, domain, search
list, hostname and MTU were never requested from the DHCP server, leaving
/mnt/wsl/resolv.conf without nameservers on servers that honour the PRL.

* init: apply clang-format to dhcpcd config string

The longer broadcast_address option name pushed the literal past the
130-column limit in .clang-format. Split it as clang-format does; the
concatenated value is unchanged.

* Update SLE15SP7 [QU5] (#41506)

* Host plugin Plan9 shares as the session user (#41548)

* Host plugin Plan9 shares as the session user

Use a dedicated per-user Plan9 server for plugin folder mounts so host filesystem permissions are preserved without relying on HCS-managed share identity.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: c20b1da0-c613-489d-92a3-9c27527c0c54

* Simplify plugin Plan9 port plumbing

Use the fixed plugin port directly in mini_init and mirror the existing per-user Plan9 server lifecycle.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: c20b1da0-c613-489d-92a3-9c27527c0c54

* Recreate stopped plugin Plan9 servers

Recreate the per-user server before adding a share when its process is no longer running.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: c20b1da0-c613-489d-92a3-9c27527c0c54

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Copilot-Session: c20b1da0-c613-489d-92a3-9c27527c0c54

* Fix virtiofs bind mounts exposing files as root-owned (#40719) (#40733)

* Fix virtiofs bind mounts exposing files as root-owned (#40719)

Add the 'metadata' option to virtiofs shares created via
HcsVirtualMachine::AddShare (the WSLC/Docker container path). Without
this option, the virtiofs device host cannot persist per-file uid/gid
in NTFS extended attributes, so all files default to uid=0/gid=0
regardless of the creating user.

This matches the behavior of the regular distro mount path
(WslCoreVm::AddVirtioFsShare) which receives metadata/uid/gid options
from the Linux init's ConvertDrvfsMountOptionsToPlan9.

Also adds a regression test (WindowsMountsVirtioFsFileOwnership) that
verifies file ownership is preserved on virtiofs mounts.

Fixes #40719

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Address code review feedback

- Add inline comment explaining why 'metadata' is required
- Use unique mount point (/virtiofs-ownership-test) to avoid test interference
- Use numeric UID (su '#65534') instead of username to avoid environment dependency

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* test: use 'nobody' user instead of numeric UID in virtiofs ownership test

The su command with numeric UID syntax ('#65534') requires the user to
exist in /etc/passwd. Use the 'nobody' account directly since it is
already available in the test VHD.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix: wrap long test command strings to satisfy clang-format 130-col limit

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* test: unmount inline with VERIFY_SUCCEEDED to match file convention

Replace the scope_exit unmount cleanup with an inline VERIFY_SUCCEEDED
call at the end of the test, matching every other mount test in this
file (e.g. WindowsMountsVirtioFsShareReuse). This also asserts the
unmount HRESULT rather than silently swallowing it.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 9213b7da-c5c8-4d9c-89ab-e80048d288a2

* Fix Windows mount test API calls

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Blue <OneBlue@users.noreply.github.com>
Copilot-Session: 9213b7da-c5c8-4d9c-89ab-e80048d288a2

* wslc: match docker prune semantics (confirmation prompt, -f aliases --force) (#41455)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* wslc: add --all to image list for docker parity (#41456)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* wslc: add --details to container logs for docker parity (#41467)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: JohnMcPMS <johnmcp@microsoft.com>

* Localization change from build: 157218885 (#41559)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Don't fail the installation if DeprovisionMsix() fails (#41453)

* Don't fail the installation if DeprovisionMsix() fails

* Apply PR feedback

* Notice change from build: 157227119 (#41564)

Co-authored-by: WSL notice <noreply@microsoft.com>

* wslc: add --size to container list for docker parity (#41477)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* wslc: add --all-tags to push for docker parity (#41500)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Fix build issue for wslsettings, and add more logging to the pipelines (#40388)

* Validate variable-length message strings (#41567)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Copilot-Session: 3086bdaf-bc43-4fed-88d1-3a95a21fd14e

* Fix WSLC fallback gateway collision (#41547)

Avoid selecting the guest IPv4 address as its synthesized default gateway when the host adapter does not expose one.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Copilot-Session: ce168659-cb9d-4f0e-8fd1-2834d065ba9d

* Reduce distro termination log noise (#41541)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Copilot-Session: adf24228-67c0-452e-9cc2-c698a8d7b3b7

* Localization change from build: 157277214 (#41571)

Co-authored-by: WSL localization <noreply@microsoft.com>

* CLI: Add global options to root help, adjust options usage (#41534)

* Add global options to root help, adjust options usage to match CLI conventions

* Trim some unnecessary test code

* Localization change from build: 157310027 (#41574)

Co-authored-by: WSL localization <noreply@microsoft.com>

* wslc: add docker --quiet to image load, image push and container cp (#41466)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Tear down the stale plugin Plan9 server before recreating it (#41565)

When the per-user plugin Plan9 server is no longer running, the previous instance was dropped without a Teardown call, so it could still hold the Plan9 port when the replacement tries to bind it.

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 0d028ad4-fe5e-4ef1-9832-18ee0e4825cc

* Use a locally imported version of docker/dockerfile instead of downloading it from the default registry (#41575)

* Use a locally imported version of docker/dockerfile instead of downloading it from the default registry

* Cleanup diff

* Use canonical path in VolumeMount_Parse_ReturnExpectedResult (#41577)

* Document WSL security model (#41556)

* Document WSL security model

Clarify WSL trust boundaries and explain that configuration settings do not establish a sandbox.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: c77eaf09-799a-416e-b4b4-19f37a4201ef

* Update WSL security model explanation

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Clarify WSL isolation guidance

Distinguish functional distribution separation from a security boundary and recommend a separately managed VM for untrusted workloads.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: c77eaf09-799a-416e-b4b4-19f37a4201ef

* Document shared WSL VM trust model

Clarify that elevated and non-elevated sessions can share utility VM state and are not separate guest security boundaries.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: c77eaf09-799a-416e-b4b4-19f37a4201ef

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot-Session: c77eaf09-799a-416e-b4b4-19f37a4201ef

* Bump GitPython to 3.1.59 (#41580)

Resolves open Dependabot alerts for GitPython <= 3.1.58 in
distributions/requirements.txt and tools/devops/requirements.txt.

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 6fcfe0f1-6be5-4913-ab36-71823443cc36

* Remove two noisy warnings from the distro validation scripts (#41579)

* Remove two noisy warnings from the distro validation scripts

* Cleanup diff

* Fix formatting of USR_SHARE_WSL assignment

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Fix activating a stopping service treated as OOM (#41460)

The current factory function for LxssUserSession and WSLCSessionManager translates the error code CO_E_SERVER_STOPPING to S_FALSE. Which combined with *ppCreated == NULL causes COM to treat this as an OOM. Leading to error messages like this when activating a stopping service:

Not enough memory resources are available to complete this operation.
Error code: Wsl/E_OUTOFMEMORY
This PR removes this conversion. So, COM actually retries when the service is stopping. And returns CO_E_SERVER_EXEC_FAILURE if the retry times out.

* Set distributionStartTimeout to 2 minutes in the tests to solve distribution start timeouts errors (#41583)

* Set distributionStartTimeout to 2 minutes in the tests to solve distribution start timeouts errors

* Update tests

* Localization change from build: 157504221 (#41602)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Enable RedirectionGuard process mitigation (#41542)

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Updates Ubuntu latest LTS images (#41465)

* Updates Ubuntu 26.04 to the .1 release

Just announced today.
Also published the up-to-date Ubuntu package to MS Store,
but I'm not referencing it here.

* Updates the 24.04.5 images just released today.

* Use the cdimages.u.c host for consistency

---------

Co-authored-by: Carlos Nihelton <carlos.nihelton@canonical.com>

* diagnostics: improve collect-wsl-logs for analysis (summary.json, README, profile info, WSL/guest state) (#40776)

* diagnostics: record capture profile in collected logs

collect-wsl-logs.ps1 did not record which WPR profile was used for a
capture. When analyzing an archive (e.g. a networking-only capture that
lacks the WSL core trace providers), there was no way to tell which
profile produced it without inferring it from the provider mix.

Write a collection-info.txt into the log folder capturing the selected
LogProfile, the mapped WPRP profile and file, the Dump and
RestartWslReproMode switches, and the collection timestamp.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* diagnostics: collect WSL version, guest state, and drop empty dumps

Add three further debugging improvements to collect-wsl-logs.ps1:

- Collect wsl --version / --status / --list --verbose into wsl-info.txt
  instead of forcing analyzers to infer the version and distro layout
  from the appx package and registry.
- Collect guest-side state (dmesg, free, uptime, ulimit, pid_max,
  threads-max, process/thread counts, top RSS) into linux_diagnostics.log
  after the repro. This is the data needed to diagnose in-distro failures
  such as 'Resource temporarily unavailable' (EAGAIN) from resource limits.
- Remove 0-byte dump files left behind when MiniDumpWriteDump fails, so
  the archive only contains real dumps.

Also set WSL_UTF8 and the console output encoding so wsl.exe output is
captured to the log files readably.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* diagnostics: add summary.json and README.md to log archive

Make collected log archives easier to analyze (by a human or an agent)
without having to run tools or infer state from individual artifacts:

- summary.json: machine-readable overview of the capture - profile,
  WSL/Windows versions, networking mode, installed distributions and
  their state, .wslconfig presence, and an inventory of non-empty dumps.
- README.md: an index of the archive contents describing each file, plus
  a note on how to decode logs.etl and how to tell when a non-default
  log profile was used.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* diagnostics: address PR feedback (utf8 wsl-info, wsl.exe timeouts, slimmer summary.json)

- Write wsl-info.txt as UTF-8 instead of the PS5.1 default UTF-16LE.
- Guard every newly-added wsl.exe call (wsl-info and guest diagnostics) with a
  timeout via a background job so a deadlocked service or bad VM state cannot
  hang log collection.
- Drop the duplicated distro-registry enumeration and .wslconfig networkingMode
  parsing from summary.json; that state is readily derived from HKCU.txt and the
  archived .wslconfig.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* diagnostics: drop wsl-info.txt and guest diagnostics collection

Remove the unconditional wsl.exe calls this PR introduced (wsl-info.txt and
linux_diagnostics.log) along with the now-unused timeout helper, per review
feedback that the log collection script should not call wsl.exe (which can hang
if the service is deadlocked or the VM is in a bad state). Pre-existing
networking-profile wsl.exe calls are left untouched.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* collect-wsl-logs: drop bundled summary.json and README per review

OneBlue noted the agent-readable index and the summary values are redundant
in every archive (an analyzer can derive them from the archive contents).
Keep only collection-info.txt, which records non-derivable capture provenance
(which WPR profile/switches were used).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Move security model under technical documentation (#41605)

* Move security model under technical documentation

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 43c7b692-ffc5-43bf-88b9-ecc927a1aa55

* Move security model into technical documentation

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 43c7b692-ffc5-43bf-88b9-ecc927a1aa55

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Copilot-Session: 43c7b692-ffc5-43bf-88b9-ecc927a1aa55

* Fix typos (#41589)

* Don't stop parsing linux config files on invalid lines (#41606)

* wslc: add --all-tags to pull for docker parity (#41494)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Added WSL container to OOBE (#41402)

* Pre merge Localization strings prior to GA (#41585)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* wslc: keep image list json CreatedSince locale-invariant (#41609)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Localization change from build: 157621275 (#41610)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Warn on an escaped CR in wsl.conf instead of dropping it silently (#41591)

`case '\r': break;` made a backslash before a CR the only unrecognised
escape the parser accepts without a diagnostic. In a CRLF file that left
the value truncated at the backslash and the remainder parsed as its own
line, with nothing reported.

Letting it fall into the default case gives the same
MessageConfigInvalidEscape warning as any other bad escape. As with those,
the line is then discarded rather than kept truncated.

* Localization change from build: 157667513 (#41614)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Set a restricted ephemeral port range for test case ConsommeTests::PortZeroBindIsTracked (#41616)

* repo: modify CODEOWNERS to change wsl-maintainers to wsl-reviewers team (#41617)

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

* Localization change from build: 157736413 (#41621)

Co-authored-by: WSL localization <noreply@microsoft.com>

* CLI: Global option scopes for nested commands (related to compose support) (#41546)

* Change default relay  buffer size to 64KiB (#41603)

The current logic uses a fixed 4KiB buffer for stdio relay on the Windows side. And uses an initial 4KiB buffer for stdio relay on the Linux side, which grows only if the message won't fit. This can severely limit the relay performance in some situations. For example, in #41572, when redirecting stdout to a SMB share.

This PR increases thedefault relay buffer size to 64KiB. Which shows significant performance improvements according to buffer size tests.

* Fix redirect stdout and stderror to the same file overlapping (#41611)

Currently the stdout and stderr relay tracks the output offset separately. And when redirected to the same file, the writes could overlap.

This PR uses the append mode for overlap io writes instead of the separate offsets in the relay. So, the file write offset is correctly tracked by the system.

* move installer log collection after repro (#41620)

The installer log files were collected before the log collection starts. Which will miss the user repro.

This PR moves it after the user repro.

* wslc: add --digests to image list for docker parity (#41457)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Localization change from build: 157843092 (#41630)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Explicitely return SOCKET from WSLCPluginAPI_ProcessGetFd() (#41626)

* In mirrored mode, handle route update as add instead of replace (#41391)

In mirrored mode, handle route update as add instead of replace
Remove usage of route update as it can overwrite routes on other interfaces. add tests that verify host routing changes are correctly reflected in Linux

---------

Co-authored-by: Catalin-Emil Fetoiu <cfetoiu@microsoft.com>

* Add wslc events command (#41608)

* Don't fail the UnitTests::Warnings test case if GlobalSecureAccess VPN is running (#41638)

* Don't fail the UnitTests::Warnings test case if GlobalSecureAccess VPN is running

* Cleanup diff

* Fix test

* Wait for wslservice to be started when running tests (#41639)

* Wait for wslservice to be started when running tests

* Fail on timeout

* Improve check

* Format

* Create new namespaces for distro cgroups (#41512)

In 2.9.8, the distro processes are separated into their own cgroups. But they remain in the same cgroup namespace. That caused compatibility issues with softwares that assume a fixed systemd cgroup layout. For example, rootless docker and nerdctl.
Fixes on Moby and nertctl are being worked on. However, to avoid issues with other software, WSL's cgroup handling should also be improved.

This PR creates new cgroup namespaces for the distros. So, to the non-critical distro processes, the systemd cgroup layout stays the same as before.
This PR also introduces a cgroup structure change to accomplish this. The systemd init is moved from wsl-user/distro-N/systemd to wsl-user/distro-N. And the initialization of the distro-N controllers is handled by systemd instead.
The processes are also moved into the non-systemd cgroup in systemdless distros. This makes sure that sub-group controllers can be enabled in the distro root.
Cgroup v2 is now enforced when distro isolation is enabled. Instead of constructing an unusable cgroup v1 layout when cgroup v1 and distro isolation are both enabled.

* Fix unnecessary delay in the port tracking loop (#41472)

Before this change, an additional 10ms delay was added in the port tracker loop presumably to make the main loop slower than the worker loop. So, the worker result does not get super dated. This is not reliable. And the 10ms delay also slows down every consecutive bind call.

This PR refactors the thread synchronization method. So, the timing between those two loops is more deterministic. And removes the performance penalty for all bind calls.

* Localization change from build: 157954210 (#41643)

Co-authored-by: WSL localization <noreply@microsoft.com>

* wslc: add --follow-link to cp (#41501)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Disable unstable bind cap test and re-enable Loopback test that was incorrectly disabled- #41648 (#41648)

Co-authored-by: Catalin-Emil Fetoiu <cfetoiu@microsoft.com>

* Move objects shared by wslc.exe and the tests to src/windows/common (#41619)

* Move objects shared by wslc.exe and the tests to src/windows/common

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Link yaml-cpp, advapi32 and Crypt32 into common

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Drop yaml-cpp, advapi32 and crypt32 from wslclib now that common provides them

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Move wslc code in common under common/wslc and namespace CLI types as wslc::cli

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Fix various protocol parsing issues (#41637)

* Save state

* Use proper arrays

* Format

* Add new tests

* Cleanup tests

* Cleanup diff

* Format

* Apply PR feedback

* Apply PR feedback

* Format

* Apply PR feedback

* Move logging call

* Apply PR feedback

* Apply PR feedback

* Localization change from build: 157980831 (#41647)

Co-authored-by: WSL localization <noreply@microsoft.com>

* Add WSLC network lifecycle events (#41576)

* Add WSLC network lifecycle events

* Localize pending network prune errors

* Fix network operation wait ownership and cleanup ordering

* Fix prune event correlation after timed-out

* Fix network event rollback and timeout recovery

* Format

* Forward Docker network events directly

* Restore lock_guard after removing event waits

* fix test

* align event stream test helpers after merge

* feedback

* Fix potential out of bound access when pretty-printing string field in init messages (#41664)

* Localization change from build: 158197536 (#41662)

Co-authored-by: WSL localization <noreply@microsoft.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Feng Wang <wang6922@outlook.com>
Co-authored-by: ggarzia-MSFT <gavingarzia@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: David Bennett <dbennett-msft@outlook.com>
Co-authored-by: WSL localization <noreply@microsoft.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: beena352 <beenachauhan@microsoft.com>
Co-authored-by: Arch Linux Technical User <65091038+archlinux-github@users.noreply.github.com>
Co-authored-by: Ben Hillis <benhillis@gmail.com>
Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: damanm24 <9593793+damanm24@users.noreply.github.com>
Co-authored-by: tega-ajise <tegjise15@gmail.com>
Co-authored-by: Tega Ajise <tegaajise@Tegas-MacBook-Pro-2.local>
Co-authored-by: Eamon <eamon112009@gmail.com>
Co-authored-by: Kevin Vega <40717198+kvega005@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: DesertRatUa <desertratua@gmail.com>
Co-authored-by: Scott Bradnick <84082961+sbradnick@users.noreply.github.com>
Co-authored-by: Stephen Halter <shalter+msft@microsoft.com>
Co-authored-by: JohnMcPMS <johnmcp@microsoft.com>
Co-authored-by: Flor Chacón <14323496+florelis@users.noreply.github.com>
Co-authored-by: Carlos Nihelton <cnihelton@ubuntu.com>
Co-authored-by: Carlos Nihelton <carlos.nihelton@canonical.com>
Co-authored-by: Anton Kesy <antonkesy@gmail.com>
Co-authored-by: Craig Loewen <crloewen@microsoft.com>
Co-authored-by: Leo Camus <leo.camus23@gmail.com>
Co-authored-by: FetoiuCatalin <fetoiucatalin@gmail.com>
Co-authored-by: Catalin-Emil Fetoiu <cfetoiu@microsoft.com>
Copilot-Session: eb7946ff-cc0b-4ff1-a059-571334b1c988
Copilot-Session: 35281c30-3d08-4f05-8c84-2ce4711023d5
Copilot-Session: c20b1da0-c613-489d-92a3-9c27527c0c54
Copilot-Session: 9213b7da-c5c8-4d9c-89ab-e80048d288a2
Copilot-Session: 3086bdaf-bc43-4fed-88d1-3a95a21fd14e
Copilot-Session: ce168659-cb9d-4f0e-8fd1-2834d065ba9d
Copilot-Session: adf24228-67c0-452e-9cc2-c698a8d7b3b7
Copilot-Session: 0d028ad4-fe5e-4ef1-9832-18ee0e4825cc
Copilot-Session: c77eaf09-799a-416e-b4b4-19f37a4201ef
Copilot-Session: 6fcfe0f1-6be5-4913-ab36-71823443cc36
Copilot-Session: 43c7b692-ffc5-43bf-88b9-ecc927a1aa55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

5 participants