github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-16 20:52:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12965 from overleaf/bg-improve-timeout-error

Browse source 
improve lock timeout error in project history

GitOrigin-RevId: fdcdacd4526e008f13c46c396fb13d07ae1b8c0f
This commit is contained in:
Brian Gough 2023-05-10 08:41:27 +01:00 committed by Copybot
parent 11dc9712eb
commit acfeafd276
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
services/project-history/app/js/LockManager.js
View file

@ -65,7 +65,9 @@ _mocks.tryLock = (key, callback) => {
'NX',
function (err, gotLock) {
if (err != null) {
return callback(OError.tag(err))
return callback(
OError.tag(err, 'redis error trying to get lock', { key })
)
}
if (gotLock === 'OK') {
metrics.inc('lock.project.try.success')
@ -94,7 +96,9 @@ _mocks.extendLock = (key, lockValue, callback) => {
LOCK_TTL,
function (err, result) {
if (err != null) {
return callback(OError.tag(err))
return callback(
OError.tag(err, 'redis error trying to extend lock', { key })
)
}
if (result != null && result !== 1) {
@ -128,9 +132,7 @@ _mocks.getLock = (key, callback) => {
return (attempt = function () {
if (Date.now() - startTime > MAX_LOCK_WAIT_TIME) {
metrics.inc('lock.project.get.failed')
const e = new OError('Timeout')
e.key = key
return callback(e)
return callback(new OError('Timeout', { key }))
}
attempts += 1