MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-29 11:27:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Check length of LogIndexes in case it is outdated (#24516)

Browse source 
Fix #24458
This commit is contained in:
Jason Song 2023-05-05 11:37:43 +08:00 committed by GitHub
parent 78fdbaf186
commit 27a569609c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
routers/web/repo/actions/view.go
View file

@ -209,8 +209,18 @@ func ViewPost(ctx *context_module.Context) {
step := steps[cursor.Step] step := steps[cursor.Step]
logLines := make([]*ViewStepLogLine, 0) // marshal to '[]' instead fo 'null' in json logLines := make([]*ViewStepLogLine, 0) // marshal to '[]' instead fo 'null' in json
if c := cursor.Cursor; c < step.LogLength && c >= 0 {
index := step.LogIndex + c index := step.LogIndex + cursor.Cursor
validCursor := cursor.Cursor >= 0 &&
// !(cursor.Cursor < step.LogLength) when the frontend tries to fetch next line before it's ready.
// So return the same cursor and empty lines to let the frontend retry.
cursor.Cursor < step.LogLength &&
// !(index < task.LogIndexes[index]) when task data is older than step data.
// It can be fixed by making sure write/read tasks and steps in the same transaction,
// but it's easier to just treat it as fetching the next line before it's ready.
index < int64(len(task.LogIndexes))
if validCursor {
length := step.LogLength - cursor.Cursor length := step.LogLength - cursor.Cursor
offset := task.LogIndexes[index] offset := task.LogIndexes[index]
var err error var err error