Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.1] HostModel: Retry ResourceUpdate on Win32 error #9012

Merged
merged 1 commit into from
Mar 25, 2020
+34 −7
Merged

[release/3.1] HostModel: Retry ResourceUpdate on Win32 error #9012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions src/managed/Microsoft.NET.HostModel/AppHost/RetryUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,43 @@ public static void RetryOnIOError(Action func)

public static void RetryOnWin32Error(Action func)
{
bool IsWin32FileLockError(int hresult)
bool IsKnownIrrecoverableError(int hresult)
{
// Error codes are defined in winerror.h
const int ErrorLockViolation = 33;
const int ErrorDriveLocked = 108;

// The error code is stored in the lowest 16 bits of the HResult
int errorCode = hresult & 0xffff;

return errorCode == ErrorLockViolation || errorCode == ErrorDriveLocked;
switch (hresult & 0xffff)
{
case 0x00000001: // ERROR_INVALID_FUNCTION
case 0x00000002: // ERROR_FILE_NOT_FOUND
case 0x00000003: // ERROR_PATH_NOT_FOUND
case 0x00000006: // ERROR_INVALID_HANDLE
case 0x00000008: // ERROR_NOT_ENOUGH_MEMORY
case 0x0000000B: // ERROR_BAD_FORMAT
case 0x0000000E: // ERROR_OUTOFMEMORY
Comment on lines +55 to +57
Copy link

Choose a reason for hiding this comment

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

Love the fact that there's an error code for both "not enough memory" and "out of memory" :)

Copy link
Member

Choose a reason for hiding this comment

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

Possibly analogous to our distinction between InsufficientMemoryException and OutOfMemoryException.

case 0x0000000F: // ERROR_INVALID_DRIVE
case 0x00000012: // ERROR_NO_MORE_FILES
case 0x00000035: // ERROR_BAD_NETPATH
case 0x00000057: // ERROR_INVALID_PARAMETER
case 0x00000071: // ERROR_NO_MORE_SEARCH_HANDLES
case 0x00000072: // ERROR_INVALID_TARGET_HANDLE
case 0x00000078: // ERROR_CALL_NOT_IMPLEMENTED
case 0x0000007B: // ERROR_INVALID_NAME
case 0x0000007C: // ERROR_INVALID_LEVEL
case 0x0000007D: // ERROR_NO_VOLUME_LABEL
case 0x0000009A: // ERROR_LABEL_TOO_LONG
case 0x000000A0: // ERROR_BAD_ARGUMENTS
case 0x000000A1: // ERROR_BAD_PATHNAME
case 0x000000CE: // ERROR_FILENAME_EXCED_RANGE
case 0x000000DF: // ERROR_FILE_TOO_LARGE
case 0x000003ED: // ERROR_UNRECOGNIZED_VOLUME
case 0x000003EE: // ERROR_FILE_INVALID
case 0x00000651: // ERROR_DEVICE_REMOVED
return true;

default:
return false;
}
}

for (int i = 1; i <= NumberOfRetries; i++)
Expand All @@ -61,7 +88,7 @@ bool IsWin32FileLockError(int hresult)
break;
}
catch (HResultException hrex)
when (i < NumberOfRetries && IsWin32FileLockError(hrex.Win32HResult))
when (i < NumberOfRetries && !IsKnownIrrecoverableError(hrex.Win32HResult))
{
Thread.Sleep(NumMilliSecondsToWait);
}
Expand Down