ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-05-29 13:54:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix service comparison when starting a stopped service

Browse Source 
When comparing a stopped container after a start request, the container
ID will be present in the target state (where usually it is not). We
were already filtering this value out of the current state, but
neglected to do so for the target state. This change now ensures we
remove it from both alias lists if it exists.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-04-03 13:08:22 +01:00
parent 1d7e5b40d2
commit 9a343316b2
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/compose/service.ts
View File

@ -650,22 +650,15 @@ export class Service {
const differentArrayFields: string[] = []; const differentArrayFields: string[] = [];
sameConfig = sameConfig =
sameConfig && sameConfig &&
_.every(Service.configArrayFields, (field: ServiceConfigArrayField) => { _.every(Service.configArrayFields, (field: keyof ServiceConfig) => {
return _.isEmpty( const eq = _.isEqual(
_.xorWith( _.sortBy(this.config[field] as Array<unknown>),
// TODO: The typings here aren't accepted, even though we _.sortBy(service.config[field] as Array<unknown>),
// know it's fine
(this.config as any)[field],
(service.config as any)[field],
(a, b) => {
const eq = _.isEqual(a, b);
if (!eq) {
differentArrayFields.push(field);
}
return eq;
},
),
); );
if (!eq) {
differentArrayFields.push(field);
}
return eq;
}); });
if (!(sameConfig && sameNetworks)) { if (!(sameConfig && sameNetworks)) {
@ -844,15 +837,20 @@ export class Service {
if (current.aliases == null) { if (current.aliases == null) {
sameNetwork = false; sameNetwork = false;
} else { } else {
// Remove the auto-added docker container id // Take out the container id from both aliases, as it *will* be present
const currentAliases = _.filter(current.aliases, (alias: string) => { // in a currently running container, and can also be present in the target
return !_.startsWith(this.containerId!, alias); // for example when doing a start-service
}); // Also sort the aliases, so we can do a simple comparison
const targetAliases = target.aliases || []; const [currentAliases, targetAliases] = [
current.aliases,
sameNetwork = _.isEmpty( target.aliases,
_.xorWith(currentAliases, targetAliases, _.isEqual), ].map(aliases =>
_.sortBy(
aliases.filter(a => !_.startsWith(this.containerId || '', a)),
),
); );
sameNetwork = _.isEqual(currentAliases, targetAliases);
} }
} }
if (target.ipv4Address != null) { if (target.ipv4Address != null) {