t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wait for all incoming calls in CachedFileProvider

Browse Source
This commit is contained in:
rootdarkarchon
2022-12-29 13:24:49 +01:00
parent 4196ab4062
commit a9337eda11
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
MareSynchronosServer/MareSynchronosStaticFilesServer/CachedFileProvider.cs
View File

@@ -27,10 +27,11 @@ public class CachedFileProvider
public async Task<FileStream?> GetFileStream(string hash, string auth) public async Task<FileStream?> GetFileStream(string hash, string auth)
{ {
var fi = FilePathUtil.GetFileInfoForHash(_basePath, hash); var fi = FilePathUtil.GetFileInfoForHash(_basePath, hash);
if (fi == null) bool hasTransferTask = _currentTransfers.TryGetValue(hash, out var transferTask);
if (fi == null && !hasTransferTask)
{ {
if (IsMainServer) return null; if (IsMainServer) return null;
if (!_currentTransfers.ContainsKey(hash)) if (transferTask == null)
{ {
_currentTransfers[hash] = Task.Run(async () => _currentTransfers[hash] = Task.Run(async () =>
{ {
@@ -52,17 +53,14 @@ public class CachedFileProvider
} }
var fileName = FilePathUtil.GetFilePath(_basePath, hash); var fileName = FilePathUtil.GetFilePath(_basePath, hash);
var fileStream = File.Create(fileName); using var fileStream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
await using (fileStream.ConfigureAwait(false)) var bufferSize = response.Content.Headers.ContentLength > 1024 * 1024 ? 4096 : 1024;
{ var buffer = new byte[bufferSize];
var bufferSize = response.Content.Headers.ContentLength > 1024 * 1024 ? 4096 : 1024;
var buffer = new byte[bufferSize];
var bytesRead = 0; var bytesRead = 0;
while ((bytesRead = await (await response.Content.ReadAsStreamAsync().ConfigureAwait(false)).ReadAsync(buffer).ConfigureAwait(false)) > 0) while ((bytesRead = await (await response.Content.ReadAsStreamAsync().ConfigureAwait(false)).ReadAsync(buffer).ConfigureAwait(false)) > 0)
{ {
await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead)).ConfigureAwait(false); await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead)).ConfigureAwait(false);
}
} }
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal); _metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
@@ -70,11 +68,14 @@ public class CachedFileProvider
}); });
} }
await _currentTransfers[hash].ConfigureAwait(false); transferTask = _currentTransfers[hash];
}
if (transferTask != null)
{
await transferTask.ConfigureAwait(false);
_currentTransfers.Remove(hash, out _); _currentTransfers.Remove(hash, out _);
fi = FilePathUtil.GetFileInfoForHash(_basePath, hash); fi = FilePathUtil.GetFileInfoForHash(_basePath, hash);
if (fi == null) return null; if (fi == null) return null;
} }
@@ -85,7 +86,7 @@ public class CachedFileProvider
{ {
try try
{ {
return new FileStream(fi.FullName, FileMode.Open, FileAccess.Read, FileShare.Read); return new FileStream(fi.FullName, FileMode.Open, FileAccess.Read, FileShare.Inheritable | FileShare.Read);
} }
catch (Exception ex) catch (Exception ex)
{ {