cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-21 04:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1995 from tgstation/sjdfhjhfs [TGSDeploy]

Browse Source 
v6.11.4: Various fixes in the static files component
This commit is contained in:
Jordan Dominion
2024-10-29 19:51:47 -04:00
committed by GitHub
parent 22a16ab4d7 7bcb7b3294
commit 2afd413fa5
2 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="WebpanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>6.11.3</TgsCoreVersion>
<TgsCoreVersion>6.11.4</TgsCoreVersion>
<TgsConfigVersion>5.3.0</TgsConfigVersion>
<TgsRestVersion>10.10.0</TgsRestVersion>
<TgsGraphQLVersion>0.2.0</TgsGraphQLVersion>
src/Tgstation.Server.Host/Components/StaticFiles/Configuration.cs
+45 -13
View File
@@ -140,9 +140,9 @@ namespace Tgstation.Server.Host.Components.StaticFiles
readonly SemaphoreSlim semaphore;
/// <summary>
/// The <see cref="CancellationTokenSource"/> that is triggered when <see cref="IDisposable.Dispose"/> is called.
/// The <see cref="CancellationTokenSource"/> that is triggered when <see cref="StopAsync(CancellationToken)"/> is called.
/// </summary>
readonly CancellationTokenSource disposeCts;
readonly CancellationTokenSource stoppingCts;
/// <summary>
/// The culmination of all upload file transfer callbacks.
@@ -186,7 +186,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
this.sessionConfiguration = sessionConfiguration ?? throw new ArgumentNullException(nameof(sessionConfiguration));
semaphore = new SemaphoreSlim(1, 1);
disposeCts = new CancellationTokenSource();
stoppingCts = new CancellationTokenSource();
uploadTasks = Task.CompletedTask;
}
@@ -194,8 +194,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
public void Dispose()
{
semaphore.Dispose();
disposeCts.Cancel();
disposeCts.Dispose();
stoppingCts.Dispose();
}
/// <inheritdoc />
@@ -310,7 +309,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
var originalSha = GetFileSha();
var disposeToken = disposeCts.Token;
var disposeToken = stoppingCts.Token;
var fileTicket = fileTransferService.CreateDownload(
new FileDownloadProvider(
() =>
@@ -472,7 +471,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
try
{
var fileTicket = fileTransferService.CreateUpload(FileUploadStreamKind.ForSynchronousIO);
var uploadCancellationToken = disposeCts.Token;
var uploadCancellationToken = stoppingCts.Token;
async Task UploadHandler()
{
await using (fileTicket)
@@ -491,7 +490,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
void WriteCallback()
{
logger.LogTrace("Running synchronous write...");
success = synchronousIOManager.WriteFileChecked(path, uploadStream, ref fileHash, cancellationToken);
success = synchronousIOManager.WriteFileChecked(path, uploadStream, ref fileHash, uploadCancellationToken);
logger.LogTrace("Finished write {un}successfully!", success ? String.Empty : "un");
}
@@ -511,9 +510,9 @@ namespace Tgstation.Server.Host.Components.StaticFiles
logger.LogTrace("Kicking off write callback");
if (systemIdentity == null)
await Task.Factory.StartNew(WriteCallback, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, TaskScheduler.Current);
await Task.Factory.StartNew(WriteCallback, uploadCancellationToken, DefaultIOManager.BlockingTaskCreationOptions, TaskScheduler.Current);
else
await systemIdentity.RunImpersonated(WriteCallback, cancellationToken);
await systemIdentity.RunImpersonated(WriteCallback, uploadCancellationToken);
}
if (!success)
@@ -534,8 +533,24 @@ namespace Tgstation.Server.Host.Components.StaticFiles
Path = configurationRelativePath,
};
lock (disposeCts)
uploadTasks = Task.WhenAll(uploadTasks, UploadHandler());
lock (stoppingCts)
{
async Task ChainUploadTasks()
{
var oldUploadTask = uploadTasks;
var newUploadTask = UploadHandler();
try
{
await oldUploadTask;
}
finally
{
await newUploadTask;
}
}
uploadTasks = ChainUploadTasks();
}
}
catch (UnauthorizedAccessException)
{
@@ -609,7 +624,24 @@ namespace Tgstation.Server.Host.Components.StaticFiles
public Task StartAsync(CancellationToken cancellationToken) => EnsureDirectories(cancellationToken);
/// <inheritdoc />
public Task StopAsync(CancellationToken cancellationToken) => EnsureDirectories(cancellationToken);
public async Task StopAsync(CancellationToken cancellationToken)
{
await EnsureDirectories(cancellationToken);
stoppingCts.Cancel();
try
{
await uploadTasks;
}
catch (OperationCanceledException ex)
{
logger.LogDebug(ex, "One or more uploads/downloads were aborted!");
}
catch (Exception ex)
{
logger.LogError(ex, "Error awaiting upload tasks!");
}
}
/// <inheritdoc />
public ValueTask HandleEvent(EventType eventType, IEnumerable<string?> parameters, bool deploymentPipeline, CancellationToken cancellationToken)