Add in load throttling based on a redis key

This commit is contained in:
James Allen 2014-02-28 19:09:29 +00:00
parent 3d70f9126e
commit 86195ce7c3
6 changed files with 136 additions and 36 deletions

View file

@ -25,6 +25,7 @@ module.exports =
docsWithPendingUpdates : DOCIDSWITHPENDINGUPDATES
combineProjectIdAndDocId: (project_id, doc_id) -> "#{project_id}:#{doc_id}"
splitProjectIdAndDocId: (project_and_doc_id) -> project_and_doc_id.split(":")
historyLoadManagerThreshold: "HistoryLoadManagerThreshold"
now : (key)->
d = new Date()
d.getDate()+":"+(d.getMonth()+1)+":"+d.getFullYear()+":"+key

View file

@ -165,6 +165,12 @@ module.exports =
getDocIdsInProject: (project_id, callback = (error, doc_ids) ->) ->
rclient.smembers keys.docsInProject(project_id: project_id), callback
getHistoryLoadManagerThreshold: (callback = (error, threshold) ->) ->
rclient.get keys.historyLoadManagerThreshold, (error, value) ->
return callback(error) if error?
return callback null, 0 if !value?
callback null, parseInt(value, 10)
getDocumentsProjectId = (doc_id, callback)->
rclient.get keys.projectKey({doc_id:doc_id}), (err, project_id)->

View file

@ -2,6 +2,7 @@ settings = require "settings-sharelatex"
request = require "request"
logger = require "logger-sharelatex"
RedisManager = require "./RedisManager"
crypto = require("crypto")
module.exports = TrackChangesManager =
flushDocChanges: (doc_id, callback = (error) ->) ->
@ -22,7 +23,11 @@ module.exports = TrackChangesManager =
FLUSH_EVERY_N_OPS: 50
pushUncompressedHistoryOp: (doc_id, op, callback = (error) ->) ->
RedisManager.getHistoryLoadManagerThreshold (error, threshold) ->
return callback(error) if error?
if TrackChangesManager.getLoadManagerBucket(doc_id) < threshold
RedisManager.pushUncompressedHistoryOp doc_id, op, (error, length) ->
return callback(error) if error?
if length > 0 and length % TrackChangesManager.FLUSH_EVERY_N_OPS == 0
# Do this in the background since it uses HTTP and so may be too
# slow to wait for when processing a doc update.
@ -31,3 +36,9 @@ module.exports = TrackChangesManager =
if error?
logger.error err: error, project_id: project_id, doc_id: doc_id, "error flushing doc to track changes api"
callback()
else
callback()
getLoadManagerBucket: (doc_id) ->
hash = crypto.createHash("md5").update(doc_id).digest("hex")
return parseInt(hash.slice(0,4), 16) % 100

View file

@ -12,7 +12,7 @@ MockWebApi = require "./helpers/MockWebApi"
DocUpdaterClient = require "./helpers/DocUpdaterClient"
describe "Applying updates to a doc", ->
before ->
before (done) ->
@lines = ["one", "two", "three"]
@update =
doc: @doc_id
@ -22,6 +22,8 @@ describe "Applying updates to a doc", ->
}]
v: 0
@result = ["one", "one and a half", "two", "three"]
rclient.set "HistoryLoadManagerThreshold", 100, (error) =>
done()
describe "when the document is not loaded", ->
before (done) ->
@ -233,7 +235,7 @@ describe "Applying updates to a doc", ->
done()
describe "with enough updates to flush to the track changes api", ->
before (done) ->
beforeEach ->
[@project_id, @doc_id] = [DocUpdaterClient.randomId(), DocUpdaterClient.randomId()]
MockWebApi.insertDoc @project_id, @doc_id, {
lines: @lines
@ -247,13 +249,27 @@ describe "Applying updates to a doc", ->
sinon.spy MockTrackChangesApi, "flushDoc"
afterEach ->
MockTrackChangesApi.flushDoc.restore()
describe "when under the load manager threshold", ->
beforeEach (done) ->
rclient.set "HistoryLoadManagerThreshold", 100, (error) =>
throw error if error?
DocUpdaterClient.sendUpdates @project_id, @doc_id, @updates, (error) =>
throw error if error?
setTimeout done, 200
after ->
MockTrackChangesApi.flushDoc.restore()
it "should flush the doc twice", ->
console.log MockTrackChangesApi.flushDoc.args
MockTrackChangesApi.flushDoc.calledTwice.should.equal true
describe "when over the load manager threshold", ->
beforeEach (done) ->
rclient.set "HistoryLoadManagerThreshold", 0, (error) =>
throw error if error?
DocUpdaterClient.sendUpdates @project_id, @doc_id, @updates, (error) =>
throw error if error?
setTimeout done, 200
it "should not flush the doc", ->
MockTrackChangesApi.flushDoc.called.should.equal false

View file

@ -0,0 +1,43 @@
sinon = require('sinon')
chai = require('chai')
should = chai.should()
modulePath = "../../../../app/js/RedisManager.js"
SandboxedModule = require('sandboxed-module')
describe "RedisManager.getHistoryLoadManagerThreshold", ->
beforeEach ->
@RedisManager = SandboxedModule.require modulePath, requires:
"redis": createClient: () =>
@rclient =
auth: () ->
"logger-sharelatex": @logger = {log: sinon.stub()}
@callback = sinon.stub()
describe "with no value", ->
beforeEach ->
@rclient.get = sinon.stub().callsArgWith(1, null, null)
@RedisManager.getHistoryLoadManagerThreshold @callback
it "should get the value", ->
@rclient.get
.calledWith("HistoryLoadManagerThreshold")
.should.equal true
it "should call the callback with 0", ->
@callback.calledWith(null, 0).should.equal true
describe "with a value", ->
beforeEach ->
@rclient.get = sinon.stub().callsArgWith(1, null, "42")
@RedisManager.getHistoryLoadManagerThreshold @callback
it "should get the value", ->
@rclient.get
.calledWith("HistoryLoadManagerThreshold")
.should.equal true
it "should call the callback with the numeric value", ->
@callback.calledWith(null, 42).should.equal true

View file

@ -44,6 +44,11 @@ describe "TrackChangesManager", ->
@op = "mock-op"
@TrackChangesManager.flushDocChanges = sinon.stub().callsArg(1)
describe "when the doc is under the load manager threshold", ->
beforeEach ->
@RedisManager.getHistoryLoadManagerThreshold = sinon.stub().callsArgWith(0, null, 40)
@TrackChangesManager.getLoadManagerBucket = sinon.stub().returns(30)
describe "pushing the op", ->
beforeEach ->
@RedisManager.pushUncompressedHistoryOp = sinon.stub().callsArgWith(2, null, 1)
@ -71,3 +76,21 @@ describe "TrackChangesManager", ->
.calledWith(@doc_id)
.should.equal true
describe "when the doc is over the load manager threshold", ->
beforeEach ->
@RedisManager.getHistoryLoadManagerThreshold = sinon.stub().callsArgWith(0, null, 40)
@TrackChangesManager.getLoadManagerBucket = sinon.stub().returns(50)
@RedisManager.pushUncompressedHistoryOp = sinon.stub().callsArgWith(2, null, 1)
@TrackChangesManager.pushUncompressedHistoryOp @doc_id, @op, @callback
it "should not push the op", ->
@RedisManager.pushUncompressedHistoryOp.called.should.equal false
it "should not try to flush the op", ->
@TrackChangesManager.flushDocChanges.called.should.equal false
it "should call the callback", ->
@callback.called.should.equal true