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

Nullify DmbFactory

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-22 09:48:49 -05:00
parent 358e6ca1c8
commit 707d69d2e6
5 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs
+48 -45
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Threading;
@@ -16,8 +17,6 @@ using Tgstation.Server.Host.Database;
using Tgstation.Server.Host.IO;
using Tgstation.Server.Host.Models;
#nullable disable
namespace Tgstation.Server.Host.Components.Deployment
{
/// <summary>
@@ -36,6 +35,7 @@ namespace Tgstation.Server.Host.Components.Deployment
}
/// <inheritdoc />
[MemberNotNullWhen(true, nameof(nextDmbProvider))]
public bool DmbAvailable => nextDmbProvider != null;
/// <summary>
@@ -91,7 +91,7 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <summary>
/// The latest <see cref="DmbProvider"/>.
/// </summary>
IDmbProvider nextDmbProvider;
IDmbProvider? nextDmbProvider;
/// <summary>
/// If the <see cref="DmbFactory"/> is "started" via <see cref="IComponentService"/>.
@@ -132,7 +132,7 @@ namespace Tgstation.Server.Host.Components.Deployment
public void Dispose() => cleanupCts.Dispose(); // we don't dispose nextDmbProvider here, since it might be the only thing we have
/// <inheritdoc />
public async ValueTask LoadCompileJob(CompileJob job, Action<bool> activationAction, CancellationToken cancellationToken)
public async ValueTask LoadCompileJob(CompileJob job, Action<bool>? activationAction, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(job);
@@ -175,8 +175,8 @@ namespace Tgstation.Server.Host.Components.Deployment
throw new ArgumentOutOfRangeException(nameof(lockCount), lockCount, "lockCount must be greater than or equal to 0!");
lock (jobLockCounts)
{
var jobId = nextDmbProvider.CompileJob.Id;
var incremented = jobLockCounts[jobId.Value] += lockCount;
var jobId = nextDmbProvider.CompileJob.Require(x => x.Id);
var incremented = jobLockCounts[jobId] += lockCount;
logger.LogTrace("Compile job {jobId} lock count now: {lockCount}", jobId, incremented);
return nextDmbProvider;
}
@@ -185,16 +185,15 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <inheritdoc />
public async Task StartAsync(CancellationToken cancellationToken)
{
CompileJob cj = null;
await databaseContextFactory.UseContext(async (db) =>
{
cj = await db
.CompileJobs
.AsQueryable()
.Where(x => x.Job.Instance.Id == metadata.Id)
.OrderByDescending(x => x.Job.StoppedAt)
.FirstOrDefaultAsync(cancellationToken);
});
CompileJob? cj = null;
await databaseContextFactory.UseContext(
async (db) =>
cj = await db
.CompileJobs
.AsQueryable()
.Where(x => x.Job.Instance!.Id == metadata.Id)
.OrderByDescending(x => x.Job.StoppedAt)
.FirstOrDefaultAsync(cancellationToken));
try
{
@@ -229,28 +228,29 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <inheritdoc />
#pragma warning disable CA1506 // TODO: Decomplexify
public async ValueTask<IDmbProvider> FromCompileJob(CompileJob compileJob, CancellationToken cancellationToken)
public async ValueTask<IDmbProvider?> FromCompileJob(CompileJob compileJob, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(compileJob);
// ensure we have the entire metadata tree
logger.LogTrace("Loading compile job {id}...", compileJob.Id);
var compileJobId = compileJob.Require(x => x.Id);
logger.LogTrace("Loading compile job {id}...", compileJobId);
await databaseContextFactory.UseContext(
async db => compileJob = await db
.CompileJobs
.AsQueryable()
.Where(x => x.Id == compileJob.Id)
.Include(x => x.Job)
.Where(x => x!.Id == compileJobId)
.Include(x => x.Job!)
.ThenInclude(x => x.StartedBy)
.Include(x => x.Job)
.Include(x => x.Job!)
.ThenInclude(x => x.Instance)
.Include(x => x.RevisionInformation)
.ThenInclude(x => x.PrimaryTestMerge)
.ThenInclude(x => x.MergedBy)
.Include(x => x.RevisionInformation)
.ThenInclude(x => x.ActiveTestMerges)
.ThenInclude(x => x.TestMerge)
.ThenInclude(x => x.MergedBy)
.Include(x => x.RevisionInformation!)
.ThenInclude(x => x.PrimaryTestMerge!)
.ThenInclude(x => x.MergedBy)
.Include(x => x.RevisionInformation!)
.ThenInclude(x => x.ActiveTestMerges!)
.ThenInclude(x => x.TestMerge!)
.ThenInclude(x => x.MergedBy)
.FirstAsync(cancellationToken)); // can't wait to see that query
if (!EngineVersion.TryParse(compileJob.EngineVersion, out var engineVersion))
@@ -318,17 +318,17 @@ namespace Tgstation.Server.Host.Components.Deployment
lock (jobLockCounts)
{
if (!jobLockCounts.TryGetValue(compileJob.Id.Value, out int value))
if (!jobLockCounts.TryGetValue(compileJobId, out int value))
{
value = 1;
jobLockCounts.Add(compileJob.Id.Value, 1);
jobLockCounts.Add(compileJobId, 1);
}
else
jobLockCounts[compileJob.Id.Value] = ++value;
jobLockCounts[compileJobId] = ++value;
providerSubmitted = true;
logger.LogTrace("Compile job {id} lock count now: {lockCount}", compileJob.Id, value);
logger.LogTrace("Compile job {id} lock count now: {lockCount}", compileJobId, value);
return newProvider;
}
}
@@ -350,7 +350,7 @@ namespace Tgstation.Server.Host.Components.Deployment
lock (jobLockCounts)
jobIdsToSkip = jobLockCounts.Keys.ToList();
List<string> jobUidsToNotErase = null;
List<string>? jobUidsToNotErase = null;
// find the uids of locked directories
if (jobIdsToSkip.Count > 0)
@@ -361,9 +361,9 @@ namespace Tgstation.Server.Host.Components.Deployment
.CompileJobs
.AsQueryable()
.Where(
x => x.Job.Instance.Id == metadata.Id
&& jobIdsToSkip.Contains(x.Id.Value))
.Select(x => x.DirectoryName.Value)
x => x.Job.Instance!.Id == metadata.Id
&& jobIdsToSkip.Contains(x.Id!.Value))
.Select(x => x.DirectoryName!.Value)
.ToListAsync(cancellationToken))
.Select(x => x.ToString())
.ToList();
@@ -372,7 +372,7 @@ namespace Tgstation.Server.Host.Components.Deployment
else
jobUidsToNotErase = new List<string>();
jobUidsToNotErase.Add(SwappableDmbProvider.LiveGameDirectory);
jobUidsToNotErase!.Add(SwappableDmbProvider.LiveGameDirectory);
logger.LogTrace("We will not clean the following directories: {directoriesToNotClean}", String.Join(", ", jobUidsToNotErase));
@@ -407,7 +407,7 @@ namespace Tgstation.Server.Host.Components.Deployment
#pragma warning restore CA1506
/// <inheritdoc />
public CompileJob LatestCompileJob()
public CompileJob? LatestCompileJob()
{
if (!DmbAvailable)
return null;
@@ -428,7 +428,7 @@ namespace Tgstation.Server.Host.Components.Deployment
// DCT: None available
var deploymentJob = remoteDeploymentManager.MarkInactive(job, CancellationToken.None);
var deleteTask = DeleteCompileJobContent(job.DirectoryName.ToString(), cleanupCts.Token);
var deleteTask = DeleteCompileJobContent(job.DirectoryName!.Value.ToString(), cleanupCts.Token);
var otherTask = cleanupTask;
async Task WrapThrowableTasks()
@@ -447,20 +447,23 @@ namespace Tgstation.Server.Host.Components.Deployment
}
lock (jobLockCounts)
if (jobLockCounts.TryGetValue(job.Id.Value, out var currentVal))
{
var jobId = job.Require(x => x.Id);
if (jobLockCounts.TryGetValue(jobId, out var currentVal))
if (currentVal == 1)
{
jobLockCounts.Remove(job.Id.Value);
logger.LogDebug("Cleaning lock-free compile job {id} => {dirName}", job.Id, job.DirectoryName);
jobLockCounts.Remove(jobId);
logger.LogDebug("Cleaning lock-free compile job {id} => {dirName}", jobId, job.DirectoryName);
cleanupTask = HandleCleanup();
}
else
{
var decremented = --jobLockCounts[job.Id.Value];
logger.LogTrace("Compile job {id} lock count now: {lockCount}", job.Id, decremented);
var decremented = --jobLockCounts[jobId];
logger.LogTrace("Compile job {id} lock count now: {lockCount}", jobId, decremented);
}
else
logger.LogError("Extra Dispose of DmbProvider for CompileJob {compileJobId}!", job.Id);
logger.LogError("Extra Dispose of DmbProvider for CompileJob {compileJobId}!", jobId);
}
}
/// <summary>
src/Tgstation.Server.Host/Components/Deployment/IDmbFactory.cs
+2 -2
View File
@@ -23,7 +23,7 @@ namespace Tgstation.Server.Host.Components.Deployment
bool DmbAvailable { get; }
/// <summary>
/// Gets the next <see cref="IDmbProvider"/>.
/// Gets the next <see cref="IDmbProvider"/>. <see cref="DmbAvailable"/> is a precondition.
/// </summary>
/// <param name="lockCount">The amount of locks to give the resulting <see cref="IDmbProvider"/>. It's <see cref="IDisposable.Dispose"/> must be called this many times to properly clean the job.</param>
/// <returns>A new <see cref="IDmbProvider"/>.</returns>
@@ -35,7 +35,7 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <param name="compileJob">The <see cref="CompileJob"/> to make the <see cref="IDmbProvider"/> for.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in a new <see cref="IDmbProvider"/> representing the <see cref="CompileJob"/> on success, <see langword="null"/> on failure.</returns>
ValueTask<IDmbProvider> FromCompileJob(CompileJob compileJob, CancellationToken cancellationToken);
ValueTask<IDmbProvider?> FromCompileJob(CompileJob compileJob, CancellationToken cancellationToken);
/// <summary>
/// Deletes all compile jobs that are inactive in the Game folder.
src/Tgstation.Server.Host/Components/Deployment/ILatestCompileJobProvider.cs
+2 -2
View File
@@ -10,7 +10,7 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <summary>
/// Gets the latest <see cref="CompileJob"/>.
/// </summary>
/// <returns>The latest <see cref="CompileJob"/>.</returns>
CompileJob LatestCompileJob();
/// <returns>The latest <see cref="CompileJob"/> or <see langword="null"/> if none are available.</returns>
CompileJob? LatestCompileJob();
}
}
src/Tgstation.Server.Host/Components/Instance.cs
+1 -1
View File
@@ -253,7 +253,7 @@ namespace Tgstation.Server.Host.Components
}
/// <inheritdoc />
public CompileJob LatestCompileJob() => dmbFactory.LatestCompileJob();
public CompileJob? LatestCompileJob() => dmbFactory.LatestCompileJob();
/// <summary>
/// The <see cref="JobEntrypoint"/> for updating the repository.
src/Tgstation.Server.Host/Components/InstanceWrapper.cs
+1 -1
View File
@@ -58,6 +58,6 @@ namespace Tgstation.Server.Host.Components
public ValueTask SetAutoUpdateInterval(uint newInterval) => Instance.SetAutoUpdateInterval(newInterval);
/// <inheritdoc />
public CompileJob LatestCompileJob() => Instance.LatestCompileJob();
public CompileJob? LatestCompileJob() => Instance.LatestCompileJob();
}
}