mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 14:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

De-race CompleteSync

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:35:35 +01:00
parent 119cde3766
commit 59e7943d6e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
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() {
defer reqWaitGroup.Done()
var jr *types.JoinResponse
jr, err = p.getJoinResponseForCompleteSync(
jr, jerr := p.getJoinResponseForCompleteSync(
ctx, roomID, r, &stateFilter, &eventFilter, req.WantFullState, req.Device,
)
if err != nil {
req.Log.WithError(err).Error("p.getJoinResponseForCompleteSync failed")
if jerr != nil {
req.Log.WithError(jerr).Error("p.getJoinResponseForCompleteSync failed")
return
}