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

Skip dependency check on kill in local mode

Browse Source 
This function would usually check that an image is present for a
dependency, but in local mode the images would have never been inserted
into the database.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-03-11 17:53:50 +00:00
parent 3b475db94c
commit 8f2d6f4d7b
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/application-manager.coffee
View File

@ -477,7 +477,12 @@ module.exports = class ApplicationManager extends EventEmitter
# Unless the update strategy requires an early kill (i.e. kill-then-download, delete-then-download), we only want
# to kill a service once the images for the services it depends on have been downloaded, so as to minimize
# downtime (but not block the killing too much, potentially causing a deadlock)
_dependenciesMetForServiceKill: (target, targetApp, availableImages) ->
_dependenciesMetForServiceKill: (target, targetApp, availableImages, localMode) ->
# Because we only check for an image being available, in local mode this will always
# be the case, so return true regardless. If this function ever checks for anything else,
# we'll need to change the logic here
if localMode
return true
if target.dependsOn?
for dependency in target.dependsOn
dependencyService = _.find(targetApp.services, serviceName: dependency)
@ -581,7 +586,7 @@ module.exports = class ApplicationManager extends EventEmitter
dependenciesMetForStart = =>
@_dependenciesMetForServiceStart(target, networkPairs, volumePairs, installPairs.concat(updatePairs))
dependenciesMetForKill = =>
!needsDownload and @_dependenciesMetForServiceKill(target, targetApp, availableImages)
!needsDownload and @_dependenciesMetForServiceKill(target, targetApp, availableImages, localMode)
# If the service is using a network or volume that is being updated, we need to kill it
# even if its strategy is handover