1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-25 13:11:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-race CompleteSync (#2601)

Browse Source 
The `err` was coming from outside of the goroutine and being written to by concurrent goroutines.
This commit is contained in:
Neil Alexander 2022-08-01 15:55:56 +01:00 committed by GitHub
parent 119cde3766
commit e94ef84aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncapi/streams/stream_pdu.go
View File

@ -109,12 +109,11 @@ func (p *PDUStreamProvider) CompleteSync(
p.queue(func() { p.queue(func() {
defer reqWaitGroup.Done() defer reqWaitGroup.Done()
var jr *types.JoinResponse jr, jerr := p.getJoinResponseForCompleteSync(
jr, err = p.getJoinResponseForCompleteSync(
ctx, roomID, r, &stateFilter, &eventFilter, req.WantFullState, req.Device, ctx, roomID, r, &stateFilter, &eventFilter, req.WantFullState, req.Device,
) )
if err != nil { if jerr != nil {
req.Log.WithError(err).Error("p.getJoinResponseForCompleteSync failed") req.Log.WithError(jerr).Error("p.getJoinResponseForCompleteSync failed")
return return
} }