Skip to content

Make PhysicalFileProvider polling more resilient to IO exceptions #72462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Make PhysicalFileProvider polling more resilient to IO exceptions #72462

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions ...ibraries/Microsoft.Extensions.FileProviders.Physical/src/Internal/FileSystemInfoHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public static bool IsExcluded(FileSystemInfo fileSystemInfo, ExclusionFilters fi
return targetInfo.LastWriteTimeUtc;
}
}
catch (FileNotFoundException)
catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
{
// The file ceased to exist between LinkTarget and ResolveLinkTarget.
// The target or the link ceased to exist between LinkTarget and ResolveLinkTarget.
}

return DateTime.MinValue;
Expand Down
13 changes: 4 additions & 9 deletions ...Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,11 @@ public async Task UsePollingFileWatcher_UseActivePolling_HasChanged_SymbolicLink

// Act - Change link target to file 2.
File.Delete(linkPath);
try
{
File.CreateSymbolicLink(linkPath, file2Path);
File.CreateSymbolicLink(linkPath, file2Path);

// Assert - It should report the change regardless of the timestamp being older.
Assert.True(await tcs.Task,
$"Change event was not raised - current time: {DateTime.UtcNow:O}, file1 LastWriteTimeUtc: {File.GetLastWriteTimeUtc(file1Path):O}, file2 LastWriteTime: {File.GetLastWriteTimeUtc(file2Path):O}.");
}
// https://github.com/dotnet/runtime/issues/56810
catch (UnauthorizedAccessException) { }
// Assert - It should report the change regardless of the timestamp being older.
Assert.True(await tcs.Task,
$"Change event was not raised - current time: {DateTime.UtcNow:O}, file1 LastWriteTimeUtc: {File.GetLastWriteTimeUtc(file1Path):O}, file2 LastWriteTime: {File.GetLastWriteTimeUtc(file2Path):O}.");
}

[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsSymLinkSupported))]
Expand Down