ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-19 13:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip initial apply until a target has been set

Browse Source 
The supervisor always applies target state on start to ensure that the
device is at the correct in case of a crash or another reason. This had
the side effect that if the database is deleted, the supervisor would
apply target state (which is empty), stopping services and possibly
causing volume data loss.

This prevents that behavior and ensures that the supervisor only
applies target state if a target has been set either by the cloud, preload or local
mode.

Change-type: patch
This commit is contained in:
Felipe Lalanne 2021-12-03 18:20:11 -03:00
parent 5de6e1125b
commit 9015b0e22f
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);
});
});
}