Add queue hardening by modifying DeploymentJobTargets, DeploymentJobSteps, and DeploymentJobs tables
- Drop existing indexes on DeploymentJobTargets and DeploymentJobSteps - Alter Status column to nvarchar(450) in DeploymentJobTargets, DeploymentJobSteps, and DeploymentJobs - Add new columns: Finished, OutputMetadataJson, Started to DeploymentJobTargets; ErrorMessage, Finished, OutputMetadataJson, Started to DeploymentJobSteps; CorrelationId, HeartbeatAt, Priority, RowVersion, ScheduledAt, WorkerName to DeploymentJobs - Create new indexes for improved query performance - Add constraints to ensure OutputMetadataJson is valid JSON - Record migration in __EFMigrationsHistory
This commit is contained in:
@@ -34,16 +34,28 @@ namespace Microsoft.SelfService.Portal.Core.API.Controllers
|
||||
{
|
||||
var deploymentBatches = _deploymentBatchInterface
|
||||
.GetDeploymentBatches()
|
||||
.Select(batch => new GetDeploymentBatchDto
|
||||
.Select(batch =>
|
||||
{
|
||||
Id = batch.Id,
|
||||
TemplateId = batch.TemplateId,
|
||||
DeploymentRuleId = batch.DeploymentRuleId,
|
||||
Status = batch.Status,
|
||||
Created = batch.Created,
|
||||
CreatedBy = batch.CreatedBy,
|
||||
Modified = batch.Modified,
|
||||
ModifiedBy = batch.ModifiedBy
|
||||
var primarySelection = batch.TemplateSelections
|
||||
.OrderBy(selection => selection.SortOrder)
|
||||
.FirstOrDefault();
|
||||
|
||||
return new GetDeploymentBatchDto
|
||||
{
|
||||
Id = batch.Id,
|
||||
TemplateId = batch.TemplateId,
|
||||
DeploymentRuleId = batch.DeploymentRuleId,
|
||||
Status = batch.Status,
|
||||
Created = batch.Created,
|
||||
CreatedBy = batch.CreatedBy,
|
||||
Modified = batch.Modified,
|
||||
ModifiedBy = batch.ModifiedBy,
|
||||
PrimaryTemplateVersionId = primarySelection?.TemplateVersionId,
|
||||
PrimaryTemplateName = primarySelection?.TemplateVersion?.Template?.Name,
|
||||
PrimaryTemplateVersion = primarySelection?.TemplateVersion?.Version,
|
||||
TemplateSelectionCount = batch.TemplateSelections.Count,
|
||||
TargetAssignmentCount = batch.TargetAssignments.Count
|
||||
};
|
||||
})
|
||||
.ToList();
|
||||
|
||||
@@ -80,6 +92,20 @@ namespace Microsoft.SelfService.Portal.Core.API.Controllers
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(ModelState);
|
||||
|
||||
if (deploymentBatch.TemplateVersionId.HasValue
|
||||
&& (deploymentBatch.TemplateSelections == null || deploymentBatch.TemplateSelections.Count == 0))
|
||||
{
|
||||
deploymentBatch.TemplateSelections = new List<AddDeploymentTemplateSelectionDto>
|
||||
{
|
||||
new()
|
||||
{
|
||||
TemplateVersionId = deploymentBatch.TemplateVersionId.Value,
|
||||
TemplateRole = "Service",
|
||||
SortOrder = 10
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
var deploymentBatchMap = _mapper.Map<DeploymentGroupModel>(deploymentBatch);
|
||||
|
||||
if (!_deploymentBatchInterface.AddDeploymentBatchById(deploymentBatchMap, deploymentBatch.TargetIds))
|
||||
|
||||
Reference in New Issue
Block a user