mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #176 from overleaf/ta-epipe-retry-revert
Remove Retries in EPIPE Errors
This commit is contained in:
commit
634fad8c6e
2 changed files with 13 additions and 81 deletions
|
@ -26,7 +26,6 @@ const LockManager = require('./DockerLockManager')
|
|||
const fs = require('fs')
|
||||
const Path = require('path')
|
||||
const _ = require('underscore')
|
||||
const metrics = require('metrics-sharelatex')
|
||||
|
||||
logger.info('using docker runner')
|
||||
|
||||
|
@ -412,28 +411,19 @@ module.exports = DockerRunner = {
|
|||
})
|
||||
}
|
||||
)
|
||||
var inspectContainer = isRetry =>
|
||||
container.inspect(function(error, stats) {
|
||||
if ((error != null ? error.statusCode : undefined) === 404) {
|
||||
return createAndStartContainer()
|
||||
} 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(
|
||||
{ container_name: name, error },
|
||||
'unable to inspect container to start'
|
||||
)
|
||||
return callback(error)
|
||||
} else {
|
||||
return startExistingContainer()
|
||||
}
|
||||
})
|
||||
inspectContainer(false)
|
||||
return container.inspect(function(error, stats) {
|
||||
if ((error != null ? error.statusCode : undefined) === 404) {
|
||||
return createAndStartContainer()
|
||||
} else if (error != null) {
|
||||
logger.err(
|
||||
{ container_name: name, error },
|
||||
'unable to inspect container to start'
|
||||
)
|
||||
return callback(error)
|
||||
} else {
|
||||
return startExistingContainer()
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
attachToContainer(containerId, attachStreamHandler, attachStartCallback) {
|
||||
|
|
|
@ -36,7 +36,6 @@ describe('DockerRunner', function() {
|
|||
'logger-sharelatex': (this.logger = {
|
||||
log: sinon.stub(),
|
||||
error: sinon.stub(),
|
||||
err: sinon.stub(),
|
||||
info: sinon.stub(),
|
||||
warn: sinon.stub()
|
||||
}),
|
||||
|
@ -388,63 +387,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() {
|
||||
beforeEach(function() {
|
||||
const exists = false
|
||||
|
|
Loading…
Reference in a new issue