ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-24 04:55:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken local mode after PR #1824

Browse Source 
PR #1824 changed app update behavior to test that all images are there
before moving between releases. This check always fails in local mode
since local mode images are handled differently.

This PR fixes local mode again by skipping the check when `localMode` is
set.

Change-type: patch
This commit is contained in:
Felipe Lalanne 2021-11-17 17:54:25 -03:00
parent f9b2872648
commit 6fd516a930
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compose/app.ts
View File

@ -491,6 +491,7 @@ export class App {
context.targetApp,
needsDownload,
context.availableImages,
context.localMode,
context.networkPairs,
context.volumePairs,
context.servicePairs,
@ -524,6 +525,7 @@ export class App {
target,
context.targetApp,
context.availableImages,
context.localMode,
context.networkPairs,
context.volumePairs,
context.servicePairs,
@ -597,6 +599,7 @@ export class App {
targetApp: App,
needsDownload: boolean,
availableImages: Image[],
localMode: boolean,
networkPairs: Array<ChangingPair<Network>>,
volumePairs: Array<ChangingPair<Volume>>,
servicePairs: Array<ChangingPair<Service>>,
@ -612,6 +615,7 @@ export class App {
target,
targetApp,
availableImages,
localMode,
networkPairs,
volumePairs,
servicePairs,
@ -627,6 +631,7 @@ export class App {
target: Service,
targetApp: App,
availableImages: Image[],
localMode: boolean,
networkPairs: Array<ChangingPair<Network>>,
volumePairs: Array<ChangingPair<Volume>>,
servicePairs: Array<ChangingPair<Service>>,
@ -674,7 +679,7 @@ export class App {
}
// do not start until all images have been downloaded
return this.targetImagesReady(targetApp, availableImages);
return this.targetImagesReady(targetApp, availableImages, localMode);
}
// Unless the update strategy requires an early kill (i.e kill-then-download,
@ -685,19 +690,23 @@ export class App {
targetApp: App,
availableImages: Image[],
localMode: boolean,
) {
// Don't kill any services before all images have been downloaded
return this.targetImagesReady(targetApp, availableImages, localMode);
}
private targetImagesReady(
targetApp: App,
availableImages: Image[],
localMode: boolean,
) {
// because we only check for an image being available, in local mode this will always
// be the case, so return true regardless. If this function ever checks anything else,
// we'll need to change the logic here
// be the case, so return true regardless.
// If we ever unify image management betwen local and cloud mode, this will have to change
if (localMode) {
return true;
}
// Don't kill any services before all images have been downloaded
return this.targetImagesReady(targetApp, availableImages);
}
private targetImagesReady(targetApp: App, availableImages: Image[]) {
return targetApp.services.every((service) =>
availableImages.some(
(image) =>