microsoft/WSL
1
0
Fork 0
mirror of https://github.com/microsoft/WSL.git synced 2025-12-11 13:54:51 -06:00
Code Issues Packages Projects Releases 94 Wiki Activity

Correctly report corrupted disks when mount() fails with EUCLEAN (#13078)

Browse Source
This commit is contained in:
Blue 2025-06-10 11:08:01 -07:00 committed by GitHub
parent 63d1396714
commit 456b68125f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/windows/service/exe/WslCoreInstance.cpp
View File

@ -59,7 +59,8 @@ WslCoreInstance::WslCoreInstance(
if (result.Result != 0) if (result.Result != 0)
{ {
if (result.Result == EINVAL && result.FailureStep == LxInitCreateInstanceStepMountDisk) // N.B. EUCLEAN (117) can be returned if the disk's journal is corrupted.
if ((result.Result == EINVAL || result.Result == 117) && result.FailureStep == LxInitCreateInstanceStepMountDisk)
{ {
THROW_HR(WSL_E_DISK_CORRUPTED); THROW_HR(WSL_E_DISK_CORRUPTED);
} }

37
test/windows/UnitTests.cpp
View File

@ -2294,7 +2294,8 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND
WSL2_TEST_ONLY(); WSL2_TEST_ONLY();
// Create a 100MB vhd without a filesystem. // Create a 100MB vhd without a filesystem.
auto vhdPath = std::filesystem::weakly_canonical(wil::GetCurrentDirectoryW<std::wstring>() + L"\\CorruptedTest.vhdx"); auto distroPath = std::filesystem::weakly_canonical(wil::GetCurrentDirectoryW<std::wstring>());
auto vhdPath = distroPath / L"CorruptedTest.vhdx";
VIRTUAL_STORAGE_TYPE storageType{}; VIRTUAL_STORAGE_TYPE storageType{};
storageType.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_VHDX; storageType.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_VHDX;
@ -2332,6 +2333,40 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND
vhd.reset(); vhd.reset();
// Create a broken distribution registration
{
const auto userKey = wsl::windows::common::registry::OpenLxssUserKey();
const auto distroKey =
wsl::windows::common::registry::CreateKey(userKey.get(), L"{baa405ef-1822-4bbe-84e2-30e4c6330d42}");
auto revert = wil::scope_exit_log(WI_DIAGNOSTICS_INFO, [&] {
wsl::windows::common::registry::DeleteKey(userKey.get(), L"{baa405ef-1822-4bbe-84e2-30e4c6330d42}");
});
wsl::windows::common::registry::WriteString(distroKey.get(), nullptr, L"BasePath", distroPath.c_str());
wsl::windows::common::registry::WriteString(distroKey.get(), nullptr, L"VhdFileName", L"CorruptedTest.vhdx");
wsl::windows::common::registry::WriteString(distroKey.get(), nullptr, L"DistributionName", L"BrokenDistro");
wsl::windows::common::registry::WriteDword(distroKey.get(), nullptr, L"DefaultUid", 0);
wsl::windows::common::registry::WriteDword(distroKey.get(), nullptr, L"Version", LXSS_DISTRO_VERSION_2);
wsl::windows::common::registry::WriteDword(distroKey.get(), nullptr, L"State", LxssDistributionStateInstalled);
wsl::windows::common::registry::WriteDword(distroKey.get(), nullptr, L"Flags", LXSS_DISTRO_FLAGS_VM_MODE);
// Validate that starting the distribution fails with the correct error code.
validateOutput(
L"-d BrokenDistro echo ok",
L"The distribution failed to start because its virtual disk is corrupted.\r\n"
L"Error code: Wsl/Service/CreateInstance/WSL_E_DISK_CORRUPTED\r\n");
// Validate that trying to export the distribution fails with the correct error code.
validateOutput(
L"--export BrokenDistro dummy.tar",
L"The distribution failed to start because its virtual disk is corrupted.\r\n"
L"Error code: Wsl/Service/WSL_E_DISK_CORRUPTED\r\n");
// Shutdown WSL to force the disk to detach.
VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--shutdown"), 0L);
}
// Import a corrupted vhd. // Import a corrupted vhd.
validateOutput( validateOutput(
std::format(L"--import-in-place test-distro-corrupted \"{}\"", vhdPath.wstring()), std::format(L"--import-in-place test-distro-corrupted \"{}\"", vhdPath.wstring()),