github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #500 from sharelatex/ja-rename-lock

Browse source 
Rename lock to avoid potential conflict with doc updater
This commit is contained in:
James Allen 2017-05-11 15:29:36 +01:00 committed by GitHub
commit cb51b1ada1
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
services/web/app/coffee/infrastructure/LockManager.coffee
View file

@ -9,17 +9,17 @@ module.exports = LockManager =
MAX_LOCK_WAIT_TIME: 10000 # 10s maximum time to spend trying to get the lock MAX_LOCK_WAIT_TIME: 10000 # 10s maximum time to spend trying to get the lock
REDIS_LOCK_EXPIRY: 30 # seconds. Time until lock auto expires in redis. REDIS_LOCK_EXPIRY: 30 # seconds. Time until lock auto expires in redis.
_blockingKey : (key)-> "Blocking:"+key _blockingKey : (key)-> "lock:web:{#{key}}"
tryLock : (key, callback = (err, isFree)->)-> tryLock : (key, callback = (err, isFree)->)->
rclient.set LockManager._blockingKey(key), "locked", "EX", LockManager.REDIS_LOCK_EXPIRY, "NX", (err, gotLock)-> rclient.set LockManager._blockingKey(key), "locked", "EX", LockManager.REDIS_LOCK_EXPIRY, "NX", (err, gotLock)->
return callback(err) if err? return callback(err) if err?
if gotLock == "OK" if gotLock == "OK"
metrics.inc "doc-not-blocking" metrics.inc "lock-not-blocking"
callback err, true callback err, true
else else
metrics.inc "doc-blocking" metrics.inc "lock-blocking"
logger.log key: key, redis_response: gotLock, "doc is locked" logger.log key: key, redis_response: gotLock, "lock is locked"
callback err, false callback err, false
getLock: (key, callback = (error) ->) -> getLock: (key, callback = (error) ->) ->
@ -42,10 +42,10 @@ module.exports = LockManager =
return callback(err) if err? return callback(err) if err?
exists = parseInt replys[0] exists = parseInt replys[0]
if exists == 1 if exists == 1
metrics.inc "doc-blocking" metrics.inc "lock-blocking"
callback err, false callback err, false
else else
metrics.inc "doc-not-blocking" metrics.inc "lock-not-blocking"
callback err, true callback err, true
releaseLock: (key, callback)-> releaseLock: (key, callback)->

2
services/web/test/UnitTests/coffee/infrastructure/LockManager/CheckingTheLock.coffee
View file

@ -4,7 +4,7 @@ path = require('path')
modulePath = path.join __dirname, '../../../../../app/js/infrastructure/LockManager.js' modulePath = path.join __dirname, '../../../../../app/js/infrastructure/LockManager.js'
project_id = 1234 project_id = 1234
doc_id = 5678 doc_id = 5678
blockingKey = "Blocking:#{doc_id}" blockingKey = "lock:web:{#{doc_id}}"
SandboxedModule = require('sandboxed-module') SandboxedModule = require('sandboxed-module')
describe 'LockManager - checking the lock', ()-> describe 'LockManager - checking the lock', ()->

2
services/web/test/UnitTests/coffee/infrastructure/LockManager/ReleasingTheLock.coffee
View file

@ -21,6 +21,6 @@ describe 'LockManager - releasing the lock', ()->
it 'should put a all data into memory', (done)-> it 'should put a all data into memory', (done)->
LockManager.releaseLock doc_id, -> LockManager.releaseLock doc_id, ->
deleteStub.calledWith("Blocking:#{doc_id}").should.equal true deleteStub.calledWith("lock:web:{#{doc_id}}").should.equal true
done() done()

2
services/web/test/UnitTests/coffee/infrastructure/LockManager/tryLockTests.coffee
View file

@ -24,7 +24,7 @@ describe 'LockManager - trying the lock', ->
@LockManager.tryLock @doc_id, @callback @LockManager.tryLock @doc_id, @callback
it "should set the lock key with an expiry if it is not set", -> it "should set the lock key with an expiry if it is not set", ->
@set.calledWith("Blocking:#{@doc_id}", "locked", "EX", 30, "NX") @set.calledWith("lock:web:{#{@doc_id}}", "locked", "EX", 30, "NX")
.should.equal true .should.equal true
it "should return the callback with true", -> it "should return the callback with true", ->