ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-22 06:57:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip image delete when applying intermediate state

Browse Source 
This replaces the previous flag `isApplyingIntermediate` on application
manager and simplifies the interface of the state engine to make temporary changes to the
general app state.

Change-type: patch
This commit is contained in:
Felipe Lalanne 2023-04-07 11:42:14 -04:00
parent 967cb7747f
commit f2ca7dbb6a
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compose/application-manager.ts
View File

@ -57,13 +57,6 @@ const localModeManager = new LocalModeManager();
export let fetchesInProgress = 0;
export let timeSpentFetching = 0;
// In the case of intermediate target apply, toggle to true to avoid unintended image deletion
let isApplyingIntermediate = false;
export function setIsApplyingIntermediate(value: boolean = false) {
isApplyingIntermediate = value;
}
export function resetTimeSpentFetching(value: number = 0) {
timeSpentFetching = value;
}
@ -129,6 +122,7 @@ function reportCurrentState(data?: Partial<InstancedAppState>) {
export async function getRequiredSteps(
currentApps: InstancedAppState,
targetApps: InstancedAppState,
keepImages?: boolean,
): Promise<CompositionStep[]> {
// get some required data
const [downloading, availableImages, { localMode, delta }] =
@ -139,9 +133,15 @@ export async function getRequiredSteps(
]);
const containerIdsByAppId = getAppContainerIds(currentApps);
// Local mode sets the image and volume retention only
// if not explicitely set by the caller
if (keepImages == null) {
keepImages = localMode;
}
return await inferNextSteps(currentApps, targetApps, {
// Images are not removed while in local mode to avoid removing the user app images
keepImages: localMode,
keepImages,
// Volumes are not removed when stopping an app when going to local mode
keepVolumes: localMode,
delta,
@ -179,7 +179,7 @@ export async function inferNextSteps(
steps.push({ action: 'ensureSupervisorNetwork' });
}
} else {
if (downloading.length === 0 && !isApplyingIntermediate) {
if (downloading.length === 0) {
// Avoid cleaning up dangling images while purging
if (!keepImages && (await imageManager.isCleanupNeeded())) {
steps.push({ action: 'cleanup' });

6
src/device-state.ts
View File

@ -701,6 +701,10 @@ export const applyTarget = async ({
const appSteps = await applicationManager.getRequiredSteps(
currentState.local.apps,
targetState.local.apps,
// Do not remove images while applying an intermediate state
// if not applying intermediate, we let getRequired steps set
// the value
intermediate || undefined,
);
if (_.isEmpty(appSteps)) {
@ -858,7 +862,7 @@ export function triggerApplyTarget({
return null;
}
export function applyIntermediateTarget(
export async function applyIntermediateTarget(
intermediate: InstancedDeviceState,
{ force = false, skipLock = false } = {},
) {