github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 06:23:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into bg-use-lodash

Browse source
This commit is contained in:
Brian Gough 2020-06-16 08:35:17 +01:00 committed by GitHub
commit f41b4daca2
2 changed files with 14 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/clsi/app/js/DockerRunner.js
View file

@ -26,7 +26,7 @@ const LockManager = require('./DockerLockManager')
const fs = require('fs') const fs = require('fs')
const Path = require('path') const Path = require('path')
const _ = require('lodash') const _ = require('lodash')
const metrics = require('metrics-sharelatex')
logger.info('using docker runner') logger.info('using docker runner')
@ -412,18 +412,10 @@ module.exports = DockerRunner = {
}) })
} }
) )
var inspectContainer = isRetry => return container.inspect(function(error, stats) {
container.inspect(function(error, stats) {
if ((error != null ? error.statusCode : undefined) === 404) { if ((error != null ? error.statusCode : undefined) === 404) {
return createAndStartContainer() return createAndStartContainer()
} else if (error != null) { } else if (error != null) {
if (error.message.match(/EPIPE/)) {
if (!isRetry) {
metrics.inc('container-inspect-epipe-retry')
return inspectContainer(true)
}
metrics.inc('container-inspect-epipe-error')
}
logger.err( logger.err(
{ container_name: name, error }, { container_name: name, error },
'unable to inspect container to start' 'unable to inspect container to start'
@ -433,7 +425,6 @@ module.exports = DockerRunner = {
return startExistingContainer() return startExistingContainer()
} }
}) })
inspectContainer(false)
}, },
attachToContainer(containerId, attachStreamHandler, attachStartCallback) { attachToContainer(containerId, attachStreamHandler, attachStartCallback) {

58
services/clsi/test/unit/js/DockerRunnerTests.js
View file

@ -36,7 +36,6 @@ describe('DockerRunner', function() {
'logger-sharelatex': (this.logger = { 'logger-sharelatex': (this.logger = {
log: sinon.stub(), log: sinon.stub(),
error: sinon.stub(), error: sinon.stub(),
err: sinon.stub(),
info: sinon.stub(), info: sinon.stub(),
warn: sinon.stub() warn: sinon.stub()
}), }),
@ -389,63 +388,6 @@ describe('DockerRunner', function() {
}) })
}) })
describe('when inspect always fails with EPIPE error', function() {
beforeEach(function() {
this.error = new Error('write EPIPE')
this.container.inspect = sinon.stub().yields(this.error)
this.container.start = sinon.stub().yields()
this.DockerRunner.startContainer(
this.options,
this.volumes,
() => {},
this.callback
)
})
it('should retry once', function() {
sinon.assert.callOrder(
this.container.inspect,
this.container.inspect,
this.callback
)
})
it('should call back with error', function() {
sinon.assert.calledWith(this.callback, this.error)
})
})
describe('when inspect fails once with EPIPE error', function() {
beforeEach(function() {
this.container.inspect = sinon.stub()
this.container.inspect.onFirstCall().yields(new Error('write EPIPE'))
this.container.inspect.onSecondCall().yields()
this.container.start = sinon.stub().yields()
this.DockerRunner.startContainer(
this.options,
this.volumes,
() => {},
this.callback
)
})
it('should retry once and start container', function() {
sinon.assert.callOrder(
this.container.inspect,
this.container.inspect,
this.DockerRunner.attachToContainer,
this.container.start,
this.callback
)
})
it('should call back without error', function() {
sinon.assert.calledWith(this.callback, null)
})
})
describe('when the container does not exist', function() { describe('when the container does not exist', function() {
beforeEach(function() { beforeEach(function() {
const exists = false const exists = false