ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-20 17:52:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #893 from balena-io/841-delete-then-download

Browse Source 
fix: Rework delete-then-download handling in state engine
This commit is contained in:
CameronDiver 2019-02-06 12:24:09 +00:00 committed by GitHub
commit 7d25f79dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/application-manager.coffee
View File

@ -545,8 +545,8 @@ module.exports = class ApplicationManager extends EventEmitter
return null
'kill-then-download': (current, target) ->
return serviceAction('kill', target.serviceId, current, target)
'delete-then-download': (current, target, needsDownload) ->
return serviceAction('kill', target.serviceId, current, target, removeImage: needsDownload)
'delete-then-download': (current, target) ->
return serviceAction('kill', target.serviceId, current, target)
'hand-over': (current, target, needsDownload, dependenciesMetForStart, dependenciesMetForKill, needsSpecialKill, timeout) ->
if needsDownload
return fetchAction(target)
@ -849,7 +849,10 @@ module.exports = class ApplicationManager extends EventEmitter
return @bestDeltaSource(image, available)
proxyvisorImages = @proxyvisor.imagesInUse(current, target)
imagesToRemove = _.filter availableAndUnused, (image) ->
potentialDeleteThenDownload = _.filter current.local.apps.services, (svc) ->
svc.config.labels['io.balena.update.strategy'] == 'delete-then-download' and svc.status == 'Stopped'
imagesToRemove = _.filter availableAndUnused.concat(potentialDeleteThenDownload), (image) ->
notUsedForDelta = !_.includes(deltaSources, image.name)
notUsedByProxyvisor = !_.some proxyvisorImages, (proxyvisorImage) -> Images.isSameImage(image, { name: proxyvisorImage })
return notUsedForDelta and notUsedByProxyvisor