Skip to content

Commit 91af5d2

Browse files
committed
Mark pruned containers as exited
1 parent 37dd3cb commit 91af5d2

2 files changed

Lines changed: 50 additions & 1 deletion

File tree

‎src/windows/wslcsession/WSLCContainer.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,17 @@ WSLCContainerImpl::~WSLCContainerImpl()
919919
unique_com_disconnect wrapper;
920920
{
921921
auto lock = m_lock.lock_exclusive();
922+
if (m_state == WslcContainerStateRunning)
923+
{
924+
// Session teardown may not deliver a Docker exit event before disconnecting the wrapper.
925+
m_state = WslcContainerStateExited;
926+
if (m_comWrapper)
927+
{
928+
std::lock_guard processesLock{m_processesLock};
929+
m_comWrapper->CacheState(m_state, m_initProcess);
930+
}
931+
}
932+
922933
wrapper = ReleaseResources();
923934
}
924935
}

‎test/windows/wslc/WSLCTests.cpp‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6952,7 +6952,7 @@ class WSLCTests
69526952

69536953
WSLCContainerState state{};
69546954
VERIFY_SUCCEEDED(container.Get().GetState(&state));
6955-
VERIFY_ARE_NOT_EQUAL(WslcContainerStateInvalid, state);
6955+
VERIFY_ARE_EQUAL(WslcContainerStateExited, state);
69566956
container.SetDeleteOnClose(false);
69576957
}
69586958

@@ -13349,6 +13349,7 @@ class WSLCTests
1334913349
WSLC_TEST_METHOD(ContainerCallRetainsSession)
1335013350
{
1335113351
auto session = CreateSession(GetDefaultSessionSettings(L"container-call-lifetime"));
13352+
LoadTestImage(*session, "alpine:latest");
1335213353

1335313354
ULONG sessionId{};
1335413355
wil::unique_handle terminationEvent;
@@ -13417,6 +13418,8 @@ class WSLCTests
1341713418
{
1341813419
const auto settings = GetDefaultSessionSettings(L"container-process-host-lifetime");
1341913420
auto session = CreateSession(settings);
13421+
LoadTestImage(*session, "alpine:latest");
13422+
1342013423
wil::unique_handle hostProcess;
1342113424
wil::unique_handle terminationEvent;
1342213425
VERIFY_SUCCEEDED(session->GetProcessHandle(&hostProcess));
@@ -13494,6 +13497,41 @@ class WSLCTests
1349413497
}
1349513498
}
1349613499

13500+
WSLC_TEST_METHOD(RunningContainerOutlivesSession)
13501+
{
13502+
for (const bool terminate : {false, true})
13503+
{
13504+
auto session = CreateSession(GetDefaultSessionSettings(L"running-container-host-lifetime"));
13505+
LoadTestImage(*session, "alpine:latest");
13506+
13507+
wil::unique_handle hostProcess;
13508+
wil::unique_handle terminationEvent;
13509+
VERIFY_SUCCEEDED(session->GetProcessHandle(&hostProcess));
13510+
VERIFY_SUCCEEDED(session->GetTerminationEvent(&terminationEvent));
13511+
13512+
WSLCContainerLauncher launcher("alpine:latest", "outlive-session", {"/bin/sleep", "600"});
13513+
auto container = launcher.Launch(*session);
13514+
container.SetDeleteOnClose(false);
13515+
VERIFY_ARE_EQUAL(WslcContainerStateRunning, container.State());
13516+
13517+
if (terminate)
13518+
{
13519+
VERIFY_SUCCEEDED(session->Terminate());
13520+
VERIFY_ARE_EQUAL(WslcContainerStateExited, container.State());
13521+
}
13522+
13523+
session.reset();
13524+
VERIFY_ARE_EQUAL(static_cast<DWORD>(WAIT_OBJECT_0), WaitForSingleObject(terminationEvent.get(), 60 * 1000));
13525+
VERIFY_ARE_EQUAL(static_cast<DWORD>(WAIT_TIMEOUT), WaitForSingleObject(hostProcess.get(), 0));
13526+
13527+
VERIFY_ARE_EQUAL(WslcContainerStateExited, container.State());
13528+
VERIFY_ARE_EQUAL(128 + WSLCSignalSIGKILL, container.GetInitProcess().Wait(30 * 1000));
13529+
13530+
container.Reset();
13531+
VERIFY_ARE_EQUAL(static_cast<DWORD>(WAIT_OBJECT_0), WaitForSingleObject(hostProcess.get(), 60 * 1000));
13532+
}
13533+
}
13534+
1349713535
WSLC_TEST_METHOD(RootNamespaceProcessOutlivesSession)
1349813536
{
1349913537
for (const bool terminate : {false, true})

0 commit comments

Comments
 (0)