ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-20 06:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always do a standard docker download on first pull

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-12-12 15:39:24 +00:00
parent 4e0b942fc5
commit 8317a1843b
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/application-manager.coffee
View File

@ -906,11 +906,28 @@ module.exports = class ApplicationManager extends EventEmitter
if _.every(nextSteps, { action: 'noop' }) if _.every(nextSteps, { action: 'noop' })
volumePromises.push(@removeAllVolumesForApp(checkInt(appId))) volumePromises.push(@removeAllVolumesForApp(checkInt(appId)))
newDownloads = _.filter(nextSteps, (s) -> s.action == 'fetch').length newDownloads = _.filter(nextSteps, (s) -> s.action == 'fetch').length
if !ignoreImages and delta and newDownloads > 0 if !ignoreImages and delta and newDownloads > 0
# Check that this is not the first pull for an
# application, as we want to download all images then
# Otherwise we want to limit the downloading of
# deltas to constants.maxDeltaDownloads
appImages = _.groupBy(availableImages, 'appId')
downloadsToBlock = downloading.length + newDownloads - constants.maxDeltaDownloads downloadsToBlock = downloading.length + newDownloads - constants.maxDeltaDownloads
while downloadsToBlock > 0
_.pull(nextSteps, _.find(nextSteps, action: 'fetch')) nextSteps = _.filter nextSteps, (step, idx) ->
if step.action == 'fetch' && downloadsToBlock > 0
imagesForThisApp = appImages[step.image.appId]
if !imagesForThisApp? or imagesForThisApp.length == 0
# There isn't a valid image for the fetch
# step, so we keep it
return true
else
downloadsToBlock -= 1 downloadsToBlock -= 1
return false
else
return true
if !ignoreImages and _.isEmpty(nextSteps) and !_.isEmpty(downloading) if !ignoreImages and _.isEmpty(nextSteps) and !_.isEmpty(downloading)
nextSteps.push({ action: 'noop' }) nextSteps.push({ action: 'noop' })
return _.uniqWith(nextSteps, _.isEqual) return _.uniqWith(nextSteps, _.isEqual)