sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Calculate initial sync async

Browse source
This commit is contained in:
Till Faelligen 2022-10-28 09:44:27 +02:00
parent f6035822e7
commit 9d6c9e4cc3
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 85 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
syncapi/streams/streams.go
View file

@ -2,6 +2,7 @@ package streams
import ( import (
"context" "context"
"fmt"
"github.com/matrix-org/dendrite/internal/caching" "github.com/matrix-org/dendrite/internal/caching"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
@ -103,3 +104,29 @@ func (s *Streams) Latest(ctx context.Context) types.StreamingToken {
PresencePosition: s.PresenceStreamProvider.LatestPosition(ctx), PresencePosition: s.PresenceStreamProvider.LatestPosition(ctx),
} }
} }
func ToToken(provider StreamProvider, position types.StreamPosition) types.StreamingToken {
switch t := provider.(type) {
case *PDUStreamProvider:
return types.StreamingToken{PDUPosition: position}
case *TypingStreamProvider:
return types.StreamingToken{TypingPosition: position}
case *ReceiptStreamProvider:
return types.StreamingToken{ReceiptPosition: position}
case *SendToDeviceStreamProvider:
return types.StreamingToken{SendToDevicePosition: position}
case *InviteStreamProvider:
return types.StreamingToken{InvitePosition: position}
case *AccountDataStreamProvider:
return types.StreamingToken{AccountDataPosition: position}
case *DeviceListStreamProvider:
return types.StreamingToken{DeviceListPosition: position}
case *NotificationDataStreamProvider:
return types.StreamingToken{NotificationDataPosition: position}
case *PresenceStreamProvider:
return types.StreamingToken{PresencePosition: position}
default:
panic(fmt.Sprintf("unknown stream provider: %T", t))
}
return types.StreamingToken{}
}

137
syncapi/sync/requestpool.go
View file

@ -225,6 +225,12 @@ var waitingSyncRequests = prometheus.NewGauge(
}, },
) )
// streamPosResponse is the response from a goroutine
type streamPosResponse struct {
provider streams.StreamProvider
pos types.StreamPosition
}
// OnIncomingSyncRequest is called when a client makes a /sync request. This function MUST be // OnIncomingSyncRequest is called when a client makes a /sync request. This function MUST be
// called in a dedicated goroutine for this request. This function will block the goroutine // called in a dedicated goroutine for this request. This function will block the goroutine
// until a response is ready, or it times out. // until a response is ready, or it times out.
@ -307,10 +313,13 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
} }
withTransaction := func(from types.StreamPosition, f func(snapshot storage.DatabaseTransaction) types.StreamPosition) types.StreamPosition { withTransaction := func(from types.StreamPosition, f func(snapshot storage.DatabaseTransaction) types.StreamPosition) types.StreamPosition {
if err := req.Context().Err(); err != nil {
return from
}
var succeeded bool var succeeded bool
snapshot, err := rp.db.NewDatabaseSnapshot(req.Context()) snapshot, err := rp.db.NewDatabaseSnapshot(req.Context())
if err != nil { if err != nil {
logrus.WithError(err).Error("Failed to acquire database snapshot for sync request") syncReq.Log.WithError(err).Error("Failed to acquire database snapshot for sync request")
return from return from
} }
defer func() { defer func() {
@ -322,82 +331,52 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
if syncReq.Since.IsEmpty() { if syncReq.Since.IsEmpty() {
// Complete sync // Complete sync
syncReq.Response.NextBatch = types.StreamingToken{ // The PDU stream needs to be the very first stream to get the data,
// Get the current DeviceListPosition first, as the currentPosition // as it sets values the other streams need
// might advance while processing other streams, resulting in flakey pduPos := withTransaction(
// tests. 0,
DeviceListPosition: withTransaction( func(txn storage.DatabaseTransaction) types.StreamPosition {
syncReq.Since.DeviceListPosition, return rp.streams.PDUStreamProvider.CompleteSync(
func(txn storage.DatabaseTransaction) types.StreamPosition { syncReq.Context, txn, syncReq,
return rp.streams.DeviceListStreamProvider.CompleteSync( )
syncReq.Context, txn, syncReq, },
) )
}, syncReq.Response.NextBatch.PDUPosition = pduPos
), allStreams := []streams.StreamProvider{
PDUPosition: withTransaction( rp.streams.DeviceListStreamProvider,
syncReq.Since.PDUPosition, rp.streams.TypingStreamProvider,
func(txn storage.DatabaseTransaction) types.StreamPosition { rp.streams.ReceiptStreamProvider,
return rp.streams.PDUStreamProvider.CompleteSync( rp.streams.InviteStreamProvider,
syncReq.Context, txn, syncReq, rp.streams.SendToDeviceStreamProvider,
) rp.streams.AccountDataStreamProvider,
}, rp.streams.NotificationDataStreamProvider,
), rp.streams.PresenceStreamProvider,
TypingPosition: withTransaction( }
syncReq.Since.TypingPosition,
func(txn storage.DatabaseTransaction) types.StreamPosition { streamPosCh := make(chan streamPosResponse, len(allStreams))
return rp.streams.TypingStreamProvider.CompleteSync( wg := sync.WaitGroup{}
syncReq.Context, txn, syncReq, wg.Add(len(allStreams))
)
}, // fan out stream calculations
), for _, s := range allStreams {
ReceiptPosition: withTransaction( go func(stream streams.StreamProvider) {
syncReq.Since.ReceiptPosition, streamPos := withTransaction(
func(txn storage.DatabaseTransaction) types.StreamPosition { 0,
return rp.streams.ReceiptStreamProvider.CompleteSync( func(txn storage.DatabaseTransaction) types.StreamPosition {
syncReq.Context, txn, syncReq, return stream.CompleteSync(
) syncReq.Context, txn, syncReq,
}, )
), },
InvitePosition: withTransaction( )
syncReq.Since.InvitePosition, streamPosCh <- streamPosResponse{provider: stream, pos: streamPos}
func(txn storage.DatabaseTransaction) types.StreamPosition { wg.Done()
return rp.streams.InviteStreamProvider.CompleteSync( }(s)
syncReq.Context, txn, syncReq, }
) // Wait for all streams to finish their work
}, wg.Wait()
), close(streamPosCh)
SendToDevicePosition: withTransaction( for resp := range streamPosCh {
syncReq.Since.SendToDevicePosition, syncReq.Response.NextBatch.ApplyUpdates(streams.ToToken(resp.provider, resp.pos))
func(txn storage.DatabaseTransaction) types.StreamPosition {
return rp.streams.SendToDeviceStreamProvider.CompleteSync(
syncReq.Context, txn, syncReq,
)
},
),
AccountDataPosition: withTransaction(
syncReq.Since.AccountDataPosition,
func(txn storage.DatabaseTransaction) types.StreamPosition {
return rp.streams.AccountDataStreamProvider.CompleteSync(
syncReq.Context, txn, syncReq,
)
},
),
NotificationDataPosition: withTransaction(
syncReq.Since.NotificationDataPosition,
func(txn storage.DatabaseTransaction) types.StreamPosition {
return rp.streams.NotificationDataStreamProvider.CompleteSync(
syncReq.Context, txn, syncReq,
)
},
),
PresencePosition: withTransaction(
syncReq.Since.PresencePosition,
func(txn storage.DatabaseTransaction) types.StreamPosition {
return rp.streams.PresenceStreamProvider.CompleteSync(
syncReq.Context, txn, syncReq,
)
},
),
} }
} else { } else {
// Incremental sync // Incremental sync
@ -544,7 +523,7 @@ func (rp *RequestPool) OnIncomingKeyChangeRequest(req *http.Request, device *use
} }
snapshot, err := rp.db.NewDatabaseSnapshot(req.Context()) snapshot, err := rp.db.NewDatabaseSnapshot(req.Context())
if err != nil { if err != nil {
logrus.WithError(err).Error("Failed to acquire database snapshot for key change") syncReq.Log.WithError(err).Error("Failed to acquire database snapshot for key change")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()
} }
var succeeded bool var succeeded bool
@ -555,7 +534,7 @@ func (rp *RequestPool) OnIncomingKeyChangeRequest(req *http.Request, device *use
syncReq.Response, fromToken.DeviceListPosition, toToken.DeviceListPosition, syncReq.Response, fromToken.DeviceListPosition, toToken.DeviceListPosition,
) )
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("Failed to DeviceListCatchup info") syncReq.Log.WithError(err).Error("Failed to DeviceListCatchup info")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()
} }
succeeded = true succeeded = true