ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-11 15:32:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update resumable-request to v2.0

Browse Source 
Turned out that disk I/O can be the bottleneck when applying deltas on some devices. When the disk can’t keep up and consume the downloaded delta, there’s memory bloat due to buffering.

The updated version provides far better reliability when the device is under load and pretty much constant memory consumption with any number of concurrent deltas.

Change-Type: patch
This commit is contained in:
Akis Kesoglou 2018-02-02 16:34:28 +02:00
parent 79277fea68
commit dc69917b5a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -50,7 +50,7 @@
"resin-lint": "^1.3.1", "resin-lint": "^1.3.1",
"resin-register-device": "^3.0.0", "resin-register-device": "^3.0.0",
"resin-sync": "^9.3.0", "resin-sync": "^9.3.0",
"resumable-request": "^1.0.1", "resumable-request": "^2.0.0",
"rimraf": "^2.5.4", "rimraf": "^2.5.4",
"rwlock": "^5.0.0", "rwlock": "^5.0.0",
"semver": "^5.3.0", "semver": "^5.3.0",

10
src/docker-utils.coffee
View File

@ -23,9 +23,9 @@ getRepoAndTag = (image) ->
registry = '' registry = ''
return { repo: "#{registry}#{imageName}", tag: tagName } return { repo: "#{registry}#{imageName}", tag: tagName }
applyDelta = (imgSrc, deltaUrl, { requestTimeout, applyTimeout, resumeOpts }, onProgress) -> applyDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress) ->
new Promise (resolve, reject) -> new Promise (resolve, reject) ->
req = resumable(request, { url: deltaUrl, timeout: requestTimeout }, resumeOpts) req = resumable(Object.assign({ url: deltaUrl }, opts))
.on('progress', onProgress) .on('progress', onProgress)
.on('retry', onProgress) .on('retry', onProgress)
.on('error', reject) .on('error', reject)
@ -38,7 +38,7 @@ applyDelta = (imgSrc, deltaUrl, { requestTimeout, applyTimeout, resumeOpts }, on
deltaStream = dockerDelta.applyDelta(imgSrc, timeout: applyTimeout) deltaStream = dockerDelta.applyDelta(imgSrc, timeout: applyTimeout)
res.pipe(deltaStream) res.pipe(deltaStream)
.on('id', resolve) .on('id', resolve)
.on('error', req.destroy.bind(req)) .on('error', req.abort.bind(req))
do -> do ->
_lock = new Lock() _lock = new Lock()
@ -103,8 +103,8 @@ do ->
deltaSrc = null deltaSrc = null
else else
deltaSrc = imgSrc deltaSrc = imgSrc
resumeOpts = { maxRetries: retryCount, retryInterval } resumeOpts = { timeout: requestTimeout, maxRetries: retryCount, retryInterval }
resolve(applyDelta(deltaSrc, deltaUrl, { requestTimeout, applyTimeout, resumeOpts }, onProgress)) resolve(applyDelta(deltaSrc, deltaUrl, applyTimeout, resumeOpts, onProgress))
.on 'error', reject .on 'error', reject
.then (id) -> .then (id) ->
getRepoAndTag(imgDest) getRepoAndTag(imgDest)

1
src/request.coffee
View File

@ -31,6 +31,7 @@ requestOpts =
'User-Agent': userAgent 'User-Agent': userAgent
resumableOpts = resumableOpts =
timeout: DEFAULT_REQUEST_TIMEOUT
maxRetries: DEFAULT_REQUEST_RETRY_COUNT maxRetries: DEFAULT_REQUEST_RETRY_COUNT
retryInterval: DEFAULT_REQUEST_RETRY_INTERVAL retryInterval: DEFAULT_REQUEST_RETRY_INTERVAL