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

ApplicationManager: when comparing images to save metadata, take docker image ids into account

Browse Source 
Otherwise we may skip saving a target image to the db when updating from legacy supervisors,
which in turn prevents from deleting the legacy image entry (with imageId = 1), leaving the
supervisor in a state where it can't report its current state to the API.

While we're at it, we also remove an unused variable in _getStatus.

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
This commit is contained in:
Pablo Carranza Velez 2018-10-23 15:08:51 -07:00
parent 67486146c4
commit 1c5891ec09
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/application-manager.coffee
View File

@ -200,8 +200,7 @@ module.exports = class ApplicationManager extends EventEmitter
@services.getStatus() @services.getStatus()
@images.getStatus(localMode) @images.getStatus(localMode)
@config.get('currentCommit') @config.get('currentCommit')
@db.models('app').select([ 'appId', 'releaseId', 'commit' ]) (services, images, currentCommit) ->
(services, images, currentCommit, targetApps) ->
apps = {} apps = {}
dependent = {} dependent = {}
releaseId = null releaseId = null
@ -808,10 +807,15 @@ module.exports = class ApplicationManager extends EventEmitter
_.map app.services, (service) -> _.map app.services, (service) ->
img = _.find(available, { dockerImageId: service.config.image, imageId: service.imageId }) ? _.find(available, { dockerImageId: service.config.image }) img = _.find(available, { dockerImageId: service.config.image, imageId: service.imageId }) ? _.find(available, { dockerImageId: service.config.image })
return _.omit(img, [ 'dockerImageId', 'id' ]) return _.omit(img, [ 'dockerImageId', 'id' ])
allImageDockerIdsForTargetApp = (app) ->
_(app.services).map((svc) -> [ svc.imageName, svc.config.image ])
.filter((img) -> img[1]?)
.value()
availableWithoutIds = _.map(available, (image) -> _.omit(image, [ 'dockerImageId', 'id' ])) availableWithoutIds = _.map(available, (image) -> _.omit(image, [ 'dockerImageId', 'id' ]))
currentImages = _.flatMap(current.local.apps, allImagesForCurrentApp) currentImages = _.flatMap(current.local.apps, allImagesForCurrentApp)
targetImages = _.flatMap(target.local.apps, allImagesForTargetApp) targetImages = _.flatMap(target.local.apps, allImagesForTargetApp)
targetImageDockerIds = _.fromPairs(_.flatMap(target.local.apps, allImageDockerIdsForTargetApp))
availableAndUnused = _.filter availableWithoutIds, (image) -> availableAndUnused = _.filter availableWithoutIds, (image) ->
!_.some currentImages.concat(targetImages), (imageInUse) -> _.isEqual(image, imageInUse) !_.some currentImages.concat(targetImages), (imageInUse) -> _.isEqual(image, imageInUse)
@ -823,8 +827,16 @@ module.exports = class ApplicationManager extends EventEmitter
imagesToSave = [] imagesToSave = []
if !localMode if !localMode
imagesToSave = _.filter targetImages, (targetImage) => imagesToSave = _.filter targetImages, (targetImage) =>
_.some(available, (availableImage) => @images.isSameImage(availableImage, targetImage)) and isActuallyAvailable = _.some(
!_.some availableWithoutIds, (img) -> _.isEqual(img, targetImage) available, (availableImage) =>
if @images.isSameImage(availableImage, targetImage)
return true
if availableImage.dockerImageId == targetImageDockerIds[targetImage.name]
return true
return false
)
isNotSaved = !_.some availableWithoutIds, (img) -> _.isEqual(img, targetImage)
return isActuallyAvailable and isNotSaved
deltaSources = _.map imagesToDownload, (image) => deltaSources = _.map imagesToDownload, (image) =>
return @bestDeltaSource(image, available) return @bestDeltaSource(image, available)