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

Measure time spent pulling images and substract it when considering the time between update cycles in the healthcheck

Browse Source 
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez 2017-12-10 22:11:53 -08:00
parent 9b4f912c7c
commit 54264e1b60
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/application.coffee
View File

@ -32,6 +32,7 @@ updateStatus =
intervalHandle: null
lastFullUpdateCycle: process.hrtime()
currentlyDownloading: false
timeSpentPulling: 0
class UpdatesLockedError extends TypedError
ImageNotFoundError = (err) ->
@ -136,7 +137,7 @@ application.localMode = false
application.healthy = ->
timeSinceLastCycle = process.hrtime(updateStatus.lastFullUpdateCycle)[0] * 1000
return updateStatus.currentlyDownloading or timeSinceLastCycle <= 2 * config.appUpdatePollInterval
return updateStatus.currentlyDownloading or timeSinceLastCycle - updateStatus.timeSpentPulling <= 2 * config.appUpdatePollInterval
application.logSystemMessage = logSystemMessage = (message, obj, eventName) ->
logger.log({ m: message, s: 1 })
@ -232,6 +233,7 @@ fetch = (app, { deltaSource, setDeviceUpdateState = true } = {}) ->
onProgress = (progress) ->
device.updateState(download_progress: progress.percentage)
startTime = process.hrtime()
docker.getImage(app.imageId).inspect()
.catch ImageNotFoundError, ->
updateStatus.currentlyDownloading = true
@ -263,6 +265,7 @@ fetch = (app, { deltaSource, setDeviceUpdateState = true } = {}) ->
logSystemEvent(logTypes.downloadAppError, app, err)
throw err
.finally ->
updateStatus.timeSpentPulling += process.hrtime(startTime)[0]
updateStatus.currentlyDownloading = false
shouldMountKmod = (image) ->
@ -895,6 +898,7 @@ application.update = update = (force, scheduled = false) ->
updateStatus.state = UPDATE_IDLE
device.updateState(status: 'Idle')
updateStatus.lastFullUpdateCycle = process.hrtime()
updateStatus.timeSpentPulling = 0
return
sanitiseContainerName = (name) -> name.replace(/^\//, '')