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

add some more metrics for files downloading from caches

Browse Source
This commit is contained in:
rootdarkarchon
2024-03-01 11:13:10 +01:00
committed by Loporrit
parent 9b9f6cd2f9
commit 012ae04dce
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MareSynchronosServer/MareSynchronosStaticFilesServer/Services/CachedFileProvider.cs
View File

@@ -105,6 +105,7 @@ public sealed class CachedFileProvider : IDisposable
{
try
{
_metrics.IncGauge(MetricsAPI.GaugeFilesDownloadingFromCache);
await DownloadTask(hash).ConfigureAwait(false);
}
catch (Exception ex)
@@ -113,6 +114,7 @@ public sealed class CachedFileProvider : IDisposable
}
finally
{
_metrics.DecGauge(MetricsAPI.GaugeFilesDownloadingFromCache);
_currentTransfers.Remove(hash, out _);
}
});
@@ -136,9 +138,29 @@ public sealed class CachedFileProvider : IDisposable
if (_currentTransfers.TryGetValue(hash, out var downloadTask))
{
await downloadTask.ConfigureAwait(false);
try
{
using CancellationTokenSource cts = new();
cts.CancelAfter(TimeSpan.FromSeconds(15));
_metrics.IncGauge(MetricsAPI.GaugeFilesTasksWaitingForDownloadFromCache);
await downloadTask.WaitAsync(cts.Token).ConfigureAwait(false);
}
catch (Exception e)
{
_logger.LogWarning(e, "Failed while waiting for download task for {hash}", hash);
return null;
}
finally
{
_metrics.DecGauge(MetricsAPI.GaugeFilesTasksWaitingForDownloadFromCache);
}
}
return GetLocalFileStream(hash);
}
public bool AnyFilesDownloading(List<string> hashes)
{
return hashes.TrueForAll(_currentTransfers.Keys.Contains);
}
}

6
MareSynchronosServer/MareSynchronosStaticFilesServer/Services/RequestQueueService.cs
View File

@@ -9,6 +9,7 @@ namespace MareSynchronosStaticFilesServer.Services;
public class RequestQueueService : IHostedService
{
private readonly IClientReadyMessageService _clientReadyMessageService;
private readonly CachedFileProvider _cachedFileProvider;
private readonly ILogger<RequestQueueService> _logger;
private readonly MareMetrics _metrics;
private readonly ConcurrentQueue<UserRequest> _queue = new();
@@ -21,7 +22,7 @@ public class RequestQueueService : IHostedService
private System.Timers.Timer _queueTimer;
public RequestQueueService(MareMetrics metrics, IConfigurationService<StaticFilesServerConfiguration> configurationService,
ILogger<RequestQueueService> logger, IClientReadyMessageService hubContext)
ILogger<RequestQueueService> logger, IClientReadyMessageService hubContext, CachedFileProvider cachedFileProvider)
{
_userQueueRequests = new UserQueueEntry[configurationService.GetValueOrDefault(nameof(StaticFilesServerConfiguration.DownloadQueueSize), 50)];
_queueExpirationSeconds = configurationService.GetValueOrDefault(nameof(StaticFilesServerConfiguration.DownloadTimeoutSeconds), 5);
@@ -30,6 +31,7 @@ public class RequestQueueService : IHostedService
_metrics = metrics;
_logger = logger;
_clientReadyMessageService = hubContext;
_cachedFileProvider = cachedFileProvider;
}
public void ActivateRequest(Guid request)
@@ -157,6 +159,7 @@ public class RequestQueueService : IHostedService
if (_priorityQueue.TryDequeue(out var prioRequest))
{
if (prioRequest.IsCancelled) continue;
if (_cachedFileProvider.AnyFilesDownloading(prioRequest.FileIds)) continue;
DequeueIntoSlot(prioRequest, i);
break;
@@ -165,6 +168,7 @@ public class RequestQueueService : IHostedService
if (_queue.TryDequeue(out var request))
{
if (request.IsCancelled) continue;
if (_cachedFileProvider.AnyFilesDownloading(request.FileIds)) continue;
DequeueIntoSlot(request, i);
break;

2
MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs
View File

@@ -74,6 +74,8 @@ public class Startup
MetricsAPI.GaugeQueueFree,
MetricsAPI.GaugeQueueInactive,
MetricsAPI.GaugeQueueActive,
MetricsAPI.GaugeFilesDownloadingFromCache,
MetricsAPI.GaugeFilesTasksWaitingForDownloadFromCache
}));
// generic services