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

Merge pull request #1841 from balena-os/initial-target

Browse Source 
Skip initial apply until a target has been set
This commit is contained in:
bulldozer-balena[bot] 2021-12-13 16:51:09 +00:00 committed by GitHub
commit f2164e98c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/device-state.ts
View File

@ -406,24 +406,17 @@ export async function loadInitialState() {
update_downloaded: false,
});
const targetApps = await applicationManager.getTargetApps();
if (!conf.provisioned || (_.isEmpty(targetApps) && !conf.targetStateSet)) {
try {
await loadTargetFromFile(null);
} finally {
await config.set({ targetStateSet: true });
}
if (!conf.provisioned || !conf.targetStateSet) {
await loadTargetFromFile(constants.appsJsonPath);
} else {
log.debug('Skipping preloading');
if (conf.provisioned && !_.isEmpty(targetApps)) {
// If we're in this case, it's because we've updated from an older supervisor
// and we need to mark that the target state has been set so that
// the supervisor doesn't try to preload again if in the future target
// apps are empty again (which may happen with multi-app).
await config.set({ targetStateSet: true });
}
}
triggerApplyTarget({ initial: true });
// Only trigger initial target if we have received a target
// from the cloud at some point
if (conf.targetStateSet) {
triggerApplyTarget({ initial: true });
}
}
// We keep compatibility with the StrictEventEmitter types
@ -498,6 +491,7 @@ export async function setTarget(target: TargetState, localSource?: boolean) {
trx,
);
}
await config.set({ targetStateSet: true }, trx);
});
});
}