mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 21:02:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix lock contention in sync notifier

Browse source
This commit is contained in:
Neil Alexander 2022-04-07 17:08:15 +01:00
parent 87b1ed1338
commit 7902859bc1
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 105 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

8
syncapi/notifier/notifier_test.go
View file

@ -175,7 +175,7 @@ func TestCorrectStreamWakeup(t *testing.T) {
time.Sleep(1 * time.Second)
wake := "two"
n.wakeupUserDevice(alice, []string{wake}, syncPositionAfter)
n._wakeupUserDevice(alice, []string{wake}, syncPositionAfter)
if result := <-awoken; result != wake {
t.Fatalf("expected to wake %q, got %q", wake, result)
@ -359,10 +359,10 @@ func waitForBlocking(s *UserDeviceStream, numBlocking uint) {
// lockedFetchUserStream invokes Notifier.fetchUserStream, respecting Notifier.streamLock.
// A new stream is made if it doesn't exist already.
func lockedFetchUserStream(n *Notifier, userID, deviceID string) *UserDeviceStream {
n.streamLock.Lock()
defer n.streamLock.Unlock()
n.lock.Lock()
defer n.lock.Unlock()
return n.fetchUserDeviceStream(userID, deviceID, true)
return n._fetchUserDeviceStream(userID, deviceID, true)
}
func newTestSyncRequest(userID, deviceID string, since types.StreamingToken) types.SyncRequest {