Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Delete nodes on decommission instead of just releasing scale in protection #2586

Merged
merged 1 commit into from
Nov 1, 2022
Merged

Delete nodes on decommission instead of just releasing scale in protection #2586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions src/ApiService/ApiService/onefuzzlib/ScalesetOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ where x.State.ReadyForReset()
};

await ReimageNodes(scaleSet, toReimage.Values, strategy);
await DeleteNodes(scaleSet, toDelete.Values, strategy);
await DeleteNodes(scaleSet, toDelete.Values);

return (toReimage.Count > 0 || toDelete.Count > 0, scaleSet);
}
Expand All @@ -629,7 +629,7 @@ public async Async.Task ReimageNodes(Scaleset scaleset, IEnumerable<Node> nodes,

if (scaleset.State == ScalesetState.Shutdown) {
_log.Info($"scaleset shutting down, deleting rather than reimaging nodes {scaleset.ScalesetId:Tag:ScalesetId}");
await DeleteNodes(scaleset, nodes, disposalStrategy);
await DeleteNodes(scaleset, nodes);
return;
}

Expand Down Expand Up @@ -658,10 +658,11 @@ public async Async.Task ReimageNodes(Scaleset scaleset, IEnumerable<Node> nodes,

switch (disposalStrategy) {
case NodeDisposalStrategy.Decommission:
_log.Info($"decommissioning nodes");
_log.Info($"Skipping reimage, deleting nodes: {string.Join(", ", nodesToReimage.Select(n => n.MachineId)):Tag:MachineIds}");
await _context.VmssOperations.DeleteNodes(scaleset.ScalesetId, nodesToReimage);
await Async.Task.WhenAll(nodesToReimage
.Select(async node => {
await _context.NodeOperations.ReleaseScaleInProtection(node).IgnoreResult();
await _context.NodeOperations.Delete(node);
tevoinea marked this conversation as resolved.
Show resolved Hide resolved
}));
return;

Expand All @@ -683,7 +684,7 @@ await Async.Task.WhenAll(nodesToReimage
}


public async Async.Task DeleteNodes(Scaleset scaleset, IEnumerable<Node> nodes, NodeDisposalStrategy disposalStrategy) {
public async Async.Task DeleteNodes(Scaleset scaleset, IEnumerable<Node> nodes) {
if (nodes is null || !nodes.Any()) {
_log.Info($"no nodes to delete: scaleset_id: {scaleset.ScalesetId:Tag:ScalesetId}");
return;
Expand All @@ -706,24 +707,12 @@ public async Async.Task DeleteNodes(Scaleset scaleset, IEnumerable<Node> nodes,
}
}

switch (disposalStrategy) {
case NodeDisposalStrategy.Decommission:
_log.Info($"decommissioning nodes");
await Async.Task.WhenAll(nodesToDelete
.Select(async node => {
await _context.NodeOperations.ReleaseScaleInProtection(node).IgnoreResult();
}));
return;

case NodeDisposalStrategy.ScaleIn:
_log.Info($"deleting nodes {scaleset.ScalesetId:Tag:ScalesetId} {string.Join(", ", nodesToDelete.Select(n => n.MachineId)):Tag:MachineIds}");
await _context.VmssOperations.DeleteNodes(scaleset.ScalesetId, nodesToDelete);
await Async.Task.WhenAll(nodesToDelete
.Select(async node => {
await _context.NodeOperations.Delete(node);
}));
return;
}
_log.Info($"deleting nodes {scaleset.ScalesetId:Tag:ScalesetId} {string.Join(", ", nodesToDelete.Select(n => n.MachineId)):Tag:MachineIds}");
await _context.VmssOperations.DeleteNodes(scaleset.ScalesetId, nodesToDelete);
await Async.Task.WhenAll(nodesToDelete
.Select(async node => {
await _context.NodeOperations.Delete(node);
}));
}

public async Task<OneFuzzResult<Scaleset>> GetById(Guid scalesetId) {
Expand Down