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

temporary test limiting parallel requests to 500

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-15 00:48:32 +01:00
parent aa177583e0
commit b806ef8b7b
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs
View File

@@ -11,6 +11,7 @@ public class RequestController : ControllerBase
{ {
private readonly CachedFileProvider _cachedFileProvider; private readonly CachedFileProvider _cachedFileProvider;
private readonly RequestQueueService _requestQueue; private readonly RequestQueueService _requestQueue;
private static SemaphoreSlim _parallelRequestSemaphore = new(500);
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue, public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue,
ServerTokenGenerator generator) : base(logger, generator) ServerTokenGenerator generator) : base(logger, generator)
@@ -21,14 +22,16 @@ public class RequestController : ControllerBase
[HttpPost] [HttpPost]
[Route(MareFiles.Request_Enqueue)] [Route(MareFiles.Request_Enqueue)]
public IActionResult PreRequestFiles([FromBody] List<string> files) public async Task<IActionResult> PreRequestFilesAsync([FromBody] List<string> files)
{ {
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
foreach (var file in files) foreach (var file in files)
{ {
_logger.LogDebug("Prerequested file: " + file); _logger.LogDebug("Prerequested file: " + file);
_cachedFileProvider.DownloadFileWhenRequired(file, Authorization); _cachedFileProvider.DownloadFileWhenRequired(file, Authorization);
} }
_parallelRequestSemaphore.Release();
return Ok(); return Ok();
} }
@@ -36,19 +39,30 @@ public class RequestController : ControllerBase
[Route(MareFiles.Request_RequestFile)] [Route(MareFiles.Request_RequestFile)]
public async Task<IActionResult> RequestFile(string file) public async Task<IActionResult> RequestFile(string file)
{ {
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
Guid g = Guid.NewGuid(); Guid g = Guid.NewGuid();
_cachedFileProvider.DownloadFileWhenRequired(file, Authorization); _cachedFileProvider.DownloadFileWhenRequired(file, Authorization);
var queueStatus = await _requestQueue.EnqueueUser(new(g, MareUser, file)); var queueStatus = await _requestQueue.EnqueueUser(new(g, MareUser, file));
_parallelRequestSemaphore.Release();
return Ok(JsonSerializer.Serialize(new QueueRequestDto(g, queueStatus))); return Ok(JsonSerializer.Serialize(new QueueRequestDto(g, queueStatus)));
} }
[HttpGet] [HttpGet]
[Route(MareFiles.Request_CheckQueue)] [Route(MareFiles.Request_CheckQueue)]
public IActionResult CheckQueue(Guid requestId) public async Task<IActionResult> CheckQueueAsync(Guid requestId)
{ {
if (_requestQueue.IsActiveProcessing(requestId, MareUser, out _)) return Ok(); await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
if (_requestQueue.IsActiveProcessing(requestId, MareUser, out _))
{
_parallelRequestSemaphore.Release();
return Ok();
}
if (_requestQueue.StillEnqueued(requestId, MareUser, out int position)) return Conflict(position); if (_requestQueue.StillEnqueued(requestId, MareUser, out int position))
{
_parallelRequestSemaphore.Release();
return Conflict(position);
}
return BadRequest(); return BadRequest();
} }