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 #11096 from overleaf/bg-clear-first-op-timestamp-when-removing-updates

Browse source 
clear first op timestamp when removing updates

GitOrigin-RevId: d561cf94df158457e58b14823e4572baac56e6d3
This commit is contained in:
Brian Gough 2023-01-16 10:43:43 +00:00 committed by Copybot
parent d1c2c46224
commit 3faff3388d
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/project-history/app/js/SyncManager.js
View file

@ -75,11 +75,16 @@ export function startHardResync(projectId, options, callback) {
if (err) { if (err) {
return releaseLock(OError.tag(err)) return releaseLock(OError.tag(err))
} }
RedisManager.destroyDocUpdatesQueue(projectId, function (err) { RedisManager.clearFirstOpTimestamp(projectId, function (err) {
if (err) { if (err) {
return releaseLock(OError.tag(err)) return releaseLock(OError.tag(err))
} }
_startResyncWithoutLock(projectId, options, releaseLock) RedisManager.destroyDocUpdatesQueue(projectId, function (err) {
if (err) {
return releaseLock(OError.tag(err))
}
_startResyncWithoutLock(projectId, options, releaseLock)
})
}) })
}), }),
function (error) { function (error) {

6
services/project-history/app/js/UpdatesProcessor.js
View file

@ -82,10 +82,8 @@ export function processUpdatesForProject(projectId, callback) {
OError.tag(error) OError.tag(error)
} }
ErrorRecorder.record(projectId, queueSize, error, callback) ErrorRecorder.record(projectId, queueSize, error, callback)
if (error == null) { // clear the timestamp in the background if the queue is now empty
// clear the flush marker in the background if the queue was fully cleared RedisManager.clearDanglingFirstOpTimestamp(projectId, () => {})
RedisManager.clearFirstOpTimestamp(projectId)
}
} }
) )
} }