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 DreamMaker

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-22 10:04:14 -05:00
parent dba8721f3e
commit 7db53b0371
9 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+3 -3
View File
@@ -375,7 +375,7 @@ namespace Tgstation.Server.Host.Components.Chat
}
/// <inheritdoc />
public Func<string, string, Action<bool>> QueueDeploymentMessage(
public Func<string?, string, Action<bool>> QueueDeploymentMessage(
Models.RevisionInformation revisionInformation,
EngineVersion engineVersion,
DateTimeOffset? estimatedCompletionTime,
@@ -389,7 +389,7 @@ namespace Tgstation.Server.Host.Components.Chat
logger.LogTrace("Sending deployment message for RevisionInformation: {revisionInfoId}", revisionInformation.Id);
var callbacks = new List<Func<string, string, ValueTask<Func<bool, ValueTask>>>>();
var callbacks = new List<Func<string?, string, ValueTask<Func<bool, ValueTask>>>>();
var task = Task.WhenAll(
wdChannels.Select(
@@ -431,7 +431,7 @@ namespace Tgstation.Server.Host.Components.Chat
Task callbackTask;
Func<bool, Task>? finalUpdateAction = null;
async Task CallbackTask(string errorMessage, string dreamMakerOutput)
async Task CallbackTask(string? errorMessage, string dreamMakerOutput)
{
await task;
var callbackResults = await ValueTaskExtensions.WhenAll(
src/Tgstation.Server.Host/Components/Chat/IChatManager.cs
+1 -1
View File
@@ -67,7 +67,7 @@ namespace Tgstation.Server.Host.Components.Chat
/// <param name="gitHubRepo">The repository GitHub name, if any.</param>
/// <param name="localCommitPushed"><see langword="true"/> if the local deployment commit was pushed to the remote repository.</param>
/// <returns>A <see cref="Func{T1, T2, TResult}"/> to call to update the message at the deployment's conclusion. Parameters: Error message if any, DreamMaker output if any. Returns an <see cref="Action"/> to call to mark the deployment as active/inactive. Parameter: If the deployment is being activated or inactivated.</returns>
Func<string, string, Action<bool>> QueueDeploymentMessage(
Func<string?, string, Action<bool>> QueueDeploymentMessage(
Models.RevisionInformation revisionInformation,
Api.Models.EngineVersion engineVersion,
DateTimeOffset? estimatedCompletionTime,
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+1 -1
View File
@@ -285,7 +285,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
}
/// <inheritdoc />
public override async ValueTask<Func<string, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
public override async ValueTask<Func<string?, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
Models.RevisionInformation revisionInformation,
EngineVersion engineVersion,
DateTimeOffset? estimatedCompletionTime,
src/Tgstation.Server.Host/Components/Chat/Providers/IProvider.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
/// <param name="localCommitPushed"><see langword="true"/> if the local deployment commit was pushed to the remote repository.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in a <see cref="Func{T1, T2, TResult}"/> to call to update the message at the deployment's conclusion. Parameters: Error message if any, DreamMaker output if any. Returns another callback which should be called to mark the deployment as active.</returns>
ValueTask<Func<string, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
ValueTask<Func<string?, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
Models.RevisionInformation revisionInformation,
Api.Models.EngineVersion engineVersion,
DateTimeOffset? estimatedCompletionTime,
src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs
+1 -1
View File
@@ -218,7 +218,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
}
/// <inheritdoc />
public override async ValueTask<Func<string, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
public override async ValueTask<Func<string?, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
Models.RevisionInformation revisionInformation,
EngineVersion engineVersion,
DateTimeOffset? estimatedCompletionTime,
src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs
+1 -1
View File
@@ -197,7 +197,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
public abstract ValueTask SendMessage(Message? replyTo, MessageContent message, ulong channelId, CancellationToken cancellationToken);
/// <inheritdoc />
public abstract ValueTask<Func<string, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
public abstract ValueTask<Func<string?, string, ValueTask<Func<bool, ValueTask>>>> SendUpdateMessage(
RevisionInformation revisionInformation,
Api.Models.EngineVersion engineVersion,
DateTimeOffset? estimatedCompletionTime,
src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+46 -47
View File
@@ -25,8 +25,6 @@ using Tgstation.Server.Host.Models;
using Tgstation.Server.Host.System;
using Tgstation.Server.Host.Utils;
#nullable disable
namespace Tgstation.Server.Host.Components.Deployment
{
/// <inheritdoc />
@@ -115,12 +113,12 @@ namespace Tgstation.Server.Host.Components.Deployment
/// <summary>
/// The active callback from <see cref="IChatManager.QueueDeploymentMessage"/>.
/// </summary>
Func<string, string, Action<bool>> currentChatCallback;
Func<string?, string, Action<bool>>? currentChatCallback;
/// <summary>
/// Cached for <see cref="currentChatCallback"/>.
/// </summary>
string currentDreamMakerOutput;
string? currentDreamMakerOutput;
/// <summary>
/// If a compile job is running.
@@ -209,18 +207,18 @@ namespace Tgstation.Server.Host.Components.Deployment
currentChatCallback = null;
currentDreamMakerOutput = null;
Models.CompileJob compileJob = null;
Models.CompileJob? compileJob = null;
try
{
string repoOwner = null;
string repoName = null;
string? repoOwner = null;
string? repoName = null;
TimeSpan? averageSpan = null;
Models.RepositorySettings repositorySettings = null;
Models.DreamDaemonSettings ddSettings = null;
Models.DreamMakerSettings dreamMakerSettings = null;
IRepository repo = null;
IRemoteDeploymentManager remoteDeploymentManager = null;
Models.RevisionInformation revInfo = null;
Models.RepositorySettings? repositorySettings = null;
Models.DreamDaemonSettings? ddSettings = null;
Models.DreamMakerSettings? dreamMakerSettings = null;
IRepository? repo = null;
IRemoteDeploymentManager? remoteDeploymentManager = null;
Models.RevisionInformation? revInfo = null;
await databaseContextFactory.UseContext(
async databaseContext =>
{
@@ -270,7 +268,7 @@ namespace Tgstation.Server.Host.Components.Deployment
throw new JobException(ErrorCode.RepoMissing);
remoteDeploymentManager = remoteDeploymentManagerFactory
.CreateRemoteDeploymentManager(metadata, repo.RemoteGitProvider.Value);
.CreateRemoteDeploymentManager(metadata, repo.RemoteGitProvider!.Value);
var repoSha = repo.Head;
repoOwner = repo.RemoteRepositoryOwner;
@@ -278,13 +276,13 @@ namespace Tgstation.Server.Host.Components.Deployment
revInfo = await databaseContext
.RevisionInformations
.AsQueryable()
.Where(x => x.CommitSha == repoSha && x.Instance.Id == metadata.Id)
.Include(x => x.ActiveTestMerges)
.ThenInclude(x => x.TestMerge)
.ThenInclude(x => x.MergedBy)
.Where(x => x.CommitSha == repoSha && x.InstanceId == metadata.Id)
.Include(x => x.ActiveTestMerges!)
.ThenInclude(x => x.TestMerge!)
.ThenInclude(x => x.MergedBy)
.FirstOrDefaultAsync(cancellationToken);
if (revInfo == default)
if (revInfo == null)
{
revInfo = new Models.RevisionInformation
{
@@ -312,17 +310,17 @@ namespace Tgstation.Server.Host.Components.Deployment
});
var likelyPushedTestMergeCommit =
repositorySettings.PushTestMergeCommits.Value
repositorySettings!.PushTestMergeCommits!.Value
&& repositorySettings.AccessToken != null
&& repositorySettings.AccessUser != null;
using (repo)
compileJob = await Compile(
job,
revInfo,
dreamMakerSettings,
ddSettings,
repo,
remoteDeploymentManager,
revInfo!,
dreamMakerSettings!,
ddSettings!,
repo!,
remoteDeploymentManager!,
progressReporter,
averageSpan,
likelyPushedTestMergeCommit,
@@ -335,11 +333,11 @@ namespace Tgstation.Server.Host.Components.Deployment
async databaseContext =>
{
var fullJob = compileJob.Job;
compileJob.Job = new Models.Job(job.Id.Value);
compileJob.Job = new Models.Job(job.Require(x => x.Id));
var fullRevInfo = compileJob.RevisionInformation;
compileJob.RevisionInformation = new Models.RevisionInformation
{
Id = revInfo.Id,
Id = revInfo!.Id,
};
databaseContext.Jobs.Attach(compileJob.Job);
@@ -351,7 +349,7 @@ namespace Tgstation.Server.Host.Components.Deployment
logger.LogTrace("Created CompileJob {compileJobId}", compileJob.Id);
try
{
var chatNotificationAction = currentChatCallback(null, compileJob.Output);
var chatNotificationAction = currentChatCallback!(null, compileJob.Output!);
await compileJobConsumer.LoadCompileJob(compileJob, chatNotificationAction, cancellationToken);
}
catch
@@ -370,11 +368,11 @@ namespace Tgstation.Server.Host.Components.Deployment
}
catch (Exception ex)
{
await CleanupFailedCompile(compileJob, remoteDeploymentManager, ex);
await CleanupFailedCompile(compileJob, remoteDeploymentManager!, ex);
throw;
}
var commentsTask = remoteDeploymentManager.PostDeploymentComments(
var commentsTask = remoteDeploymentManager!.PostDeploymentComments(
compileJob,
activeCompileJob?.RevisionInformation,
repositorySettings,
@@ -401,7 +399,7 @@ namespace Tgstation.Server.Host.Components.Deployment
{
currentChatCallback?.Invoke(
FormatExceptionForUsers(ex),
currentDreamMakerOutput);
currentDreamMakerOutput!);
throw;
}
@@ -423,13 +421,13 @@ namespace Tgstation.Server.Host.Components.Deployment
var previousCompileJobs = await databaseContext
.CompileJobs
.AsQueryable()
.Where(x => x.Job.Instance.Id == metadata.Id)
.Where(x => x.Job.Instance!.Id == metadata.Id)
.OrderByDescending(x => x.Job.StoppedAt)
.Take(10)
.Select(x => new
{
x.Job.StoppedAt,
x.Job.StartedAt,
StoppedAt = x.Job.StoppedAt!.Value,
StartedAt = x.Job.StartedAt!.Value,
})
.ToListAsync(cancellationToken);
@@ -438,7 +436,7 @@ namespace Tgstation.Server.Host.Components.Deployment
{
var totalSpan = TimeSpan.Zero;
foreach (var previousCompileJob in previousCompileJobs)
totalSpan += previousCompileJob.StoppedAt.Value - previousCompileJob.StartedAt.Value;
totalSpan += previousCompileJob.StoppedAt - previousCompileJob.StartedAt;
averageSpan = totalSpan / previousCompileJobs.Count;
}
@@ -501,7 +499,7 @@ namespace Tgstation.Server.Host.Components.Deployment
compileJob,
cancellationToken);
logger.LogTrace("Deployment will timeout at {timeoutTime}", DateTimeOffset.UtcNow + dreamMakerSettings.Timeout.Value);
logger.LogTrace("Deployment will timeout at {timeoutTime}", DateTimeOffset.UtcNow + dreamMakerSettings.Timeout!.Value);
using var timeoutTokenSource = new CancellationTokenSource(dreamMakerSettings.Timeout.Value);
var timeoutToken = timeoutTokenSource.Token;
using (timeoutToken.Register(() => logger.LogWarning("Deployment timed out!")))
@@ -563,7 +561,7 @@ namespace Tgstation.Server.Host.Components.Deployment
IRemoteDeploymentManager remoteDeploymentManager,
CancellationToken cancellationToken)
{
var outputDirectory = job.DirectoryName.ToString();
var outputDirectory = job.DirectoryName!.Value.ToString();
logger.LogTrace("Compile output GUID: {dirGuid}", outputDirectory);
try
@@ -647,13 +645,13 @@ namespace Tgstation.Server.Host.Components.Deployment
progressReporter.StageName = "Validating DMAPI";
await VerifyApi(
launchParameters.StartupTimeout.Value,
dreamMakerSettings.ApiValidationSecurityLevel.Value,
launchParameters.StartupTimeout!.Value,
dreamMakerSettings.ApiValidationSecurityLevel!.Value,
job,
engineLock,
dreamMakerSettings.ApiValidationPort.Value,
dreamMakerSettings.RequireDMApiValidation.Value,
launchParameters.LogOutput.Value,
dreamMakerSettings.ApiValidationPort!.Value,
dreamMakerSettings.RequireDMApiValidation!.Value,
launchParameters.LogOutput!.Value,
cancellationToken);
}
catch (JobException)
@@ -799,7 +797,7 @@ namespace Tgstation.Server.Host.Components.Deployment
ApiValidationStatus validationStatus;
await using (var provider = new TemporaryDmbProvider(
ioManager.ResolvePath(job.DirectoryName.ToString()),
ioManager.ResolvePath(job.DirectoryName!.Value.ToString()),
job,
engineLock.Version))
await using (var controller = await sessionControllerFactory.LaunchNew(provider, engineLock, launchParameters, true, cancellationToken))
@@ -859,7 +857,7 @@ namespace Tgstation.Server.Host.Components.Deployment
await using var dm = processExecutor.LaunchProcess(
engineLock.CompilerExePath,
ioManager.ResolvePath(
job.DirectoryName.ToString()),
job.DirectoryName!.Value.ToString()),
arguments,
readStandardHandles: true,
noShellExecute: true);
@@ -889,14 +887,15 @@ namespace Tgstation.Server.Host.Components.Deployment
async ValueTask ModifyDme(Models.CompileJob job, CancellationToken cancellationToken)
{
var dmeFileName = String.Join('.', job.DmeName, DmeExtension);
var dmePath = ioManager.ConcatPath(job.DirectoryName.ToString(), dmeFileName);
var stringDirectoryName = job.DirectoryName!.Value.ToString();
var dmePath = ioManager.ConcatPath(stringDirectoryName, dmeFileName);
var dmeReadTask = ioManager.ReadAllBytes(dmePath, cancellationToken);
var dmeModificationsTask = configuration.CopyDMFilesTo(
dmeFileName,
ioManager.ResolvePath(
ioManager.ConcatPath(
job.DirectoryName.ToString(),
stringDirectoryName,
ioManager.GetDirectoryName(dmeFileName))),
cancellationToken);
@@ -955,7 +954,7 @@ namespace Tgstation.Server.Host.Components.Deployment
async ValueTask CleanDir()
{
logger.LogTrace("Cleaning compile directory...");
var jobPath = job.DirectoryName.ToString();
var jobPath = job.DirectoryName!.Value.ToString();
try
{
// DCT: None available
src/Tgstation.Server.Host/Components/Deployment/Remote/BaseRemoteDeploymentManager.cs
+9 -4
View File
@@ -52,13 +52,18 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
/// <inheritdoc />
public async ValueTask PostDeploymentComments(
CompileJob compileJob,
RevisionInformation previousRevisionInformation,
RevisionInformation? previousRevisionInformation,
RepositorySettings repositorySettings,
string repoOwner,
string repoName,
string? repoOwner,
string? repoName,
CancellationToken cancellationToken)
{
if (repositorySettings?.AccessToken == null)
ArgumentNullException.ThrowIfNull(compileJob);
ArgumentNullException.ThrowIfNull(repositorySettings);
ArgumentNullException.ThrowIfNull(repoOwner);
ArgumentNullException.ThrowIfNull(repoName);
if (repositorySettings.AccessToken == null)
return;
var deployedRevisionInformation = compileJob.RevisionInformation;
src/Tgstation.Server.Host/Components/Deployment/Remote/IRemoteDeploymentManager.cs
+4 -4
View File
@@ -66,7 +66,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
/// Post deployment comments to the test merge ticket.
/// </summary>
/// <param name="compileJob">The deployed <see cref="CompileJob"/>.</param>
/// <param name="previousRevisionInformation">The <see cref="RevisionInformation"/> of the previous deployment.</param>
/// <param name="previousRevisionInformation">The optional <see cref="RevisionInformation"/> of the previous deployment.</param>
/// <param name="repositorySettings">The <see cref="RepositorySettings"/>.</param>
/// <param name="repoOwner">The remote repostiory owner.</param>
/// <param name="repoName">The remote repostiory name.</param>
@@ -74,10 +74,10 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
/// <returns>A <see cref="ValueTask"/> representing the running operation.</returns>
ValueTask PostDeploymentComments(
CompileJob compileJob,
RevisionInformation previousRevisionInformation,
RevisionInformation? previousRevisionInformation,
RepositorySettings repositorySettings,
string repoOwner,
string repoName,
string? repoOwner,
string? repoName,
CancellationToken cancellationToken);
/// <summary>