mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-10 06:53:00 +00:00
05e1ae8745
* Room version 2 by default, other wiring updates, update gomatrixserverlib * Fix nil pointer exception * Fix some more nil pointer exceptions hopefully * Update gomatrixserverlib * Send all room versions when joining, not just stable ones * Remove room version cquery * Get room version when getting events from the roomserver database * Reset default back to room version 2 * Don't generate event IDs unless needed * Revert "Remove room version cquery" This reverts commit a170d5873360dd059614460acc8b21ab2cda9767. * Query room version in federation API, client API as needed * Improvements to make_join send_join dance * Make room server producers use headered events * Lint tweaks * Update gomatrixserverlib * Versioned SendJoin * Query room version in syncapi backfill * Handle transaction marshalling/unmarshalling within Dendrite * Sorta fix federation (kinda) * whoops commit federation API too * Use NewEventFromTrustedJSON when getting events from the database * Update gomatrixserverlib * Strip headers on federationapi endpoints * Fix bug in clientapi profile room version query * Update gomatrixserverlib * Return more useful error if room version query doesn't find the room * Update gomatrixserverlib * Update gomatrixserverlib * Maybe fix federation * Fix formatting directive * Update sytest whitelist and blacklist * Temporarily disable room versions 3 and 4 until gmsl is fixed * Fix count of EDUs in logging * Update gomatrixserverlib * Update gomatrixserverlib * Update gomatrixserverlib * Rely on EventBuilder in gmsl to generate the event IDs for us * Some review comments fixed * Move function out of common and into gmsl * Comment in federationsender destinationqueue * Update gomatrixserverlib
141 lines
4.2 KiB
Go
141 lines
4.2 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package queue
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/matrix-org/util"
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// destinationQueue is a queue of events for a single destination.
|
|
// It is responsible for sending the events to the destination and
|
|
// ensures that only one request is in flight to a given destination
|
|
// at a time.
|
|
type destinationQueue struct {
|
|
client *gomatrixserverlib.FederationClient
|
|
origin gomatrixserverlib.ServerName
|
|
destination gomatrixserverlib.ServerName
|
|
// The running mutex protects running, sentCounter, lastTransactionIDs and
|
|
// pendingEvents, pendingEDUs.
|
|
runningMutex sync.Mutex
|
|
running bool
|
|
sentCounter int
|
|
lastTransactionIDs []gomatrixserverlib.TransactionID
|
|
pendingEvents []*gomatrixserverlib.HeaderedEvent
|
|
pendingEDUs []*gomatrixserverlib.EDU
|
|
}
|
|
|
|
// Send event adds the event to the pending queue for the destination.
|
|
// If the queue is empty then it starts a background goroutine to
|
|
// start sending events to that destination.
|
|
func (oq *destinationQueue) sendEvent(ev *gomatrixserverlib.HeaderedEvent) {
|
|
oq.runningMutex.Lock()
|
|
defer oq.runningMutex.Unlock()
|
|
oq.pendingEvents = append(oq.pendingEvents, ev)
|
|
if !oq.running {
|
|
oq.running = true
|
|
go oq.backgroundSend()
|
|
}
|
|
}
|
|
|
|
// sendEDU adds the EDU event to the pending queue for the destination.
|
|
// If the queue is empty then it starts a background goroutine to
|
|
// start sending event to that destination.
|
|
func (oq *destinationQueue) sendEDU(e *gomatrixserverlib.EDU) {
|
|
oq.runningMutex.Lock()
|
|
defer oq.runningMutex.Unlock()
|
|
oq.pendingEDUs = append(oq.pendingEDUs, e)
|
|
if !oq.running {
|
|
oq.running = true
|
|
go oq.backgroundSend()
|
|
}
|
|
}
|
|
|
|
func (oq *destinationQueue) backgroundSend() {
|
|
for {
|
|
t := oq.next()
|
|
if t == nil {
|
|
// If the queue is empty then stop processing for this destination.
|
|
// TODO: Remove this destination from the queue map.
|
|
return
|
|
}
|
|
|
|
// TODO: handle retries.
|
|
// TODO: blacklist uncooperative servers.
|
|
|
|
util.GetLogger(context.TODO()).Infof("Sending transaction %q containing %d PDUs, %d EDUs", t.TransactionID, len(t.PDUs), len(t.EDUs))
|
|
|
|
_, err := oq.client.SendTransaction(context.TODO(), *t)
|
|
if err != nil {
|
|
log.WithFields(log.Fields{
|
|
"destination": oq.destination,
|
|
log.ErrorKey: err,
|
|
}).Info("problem sending transaction")
|
|
}
|
|
}
|
|
}
|
|
|
|
// next creates a new transaction from the pending event queue
|
|
// and flushes the queue.
|
|
// Returns nil if the queue was empty.
|
|
func (oq *destinationQueue) next() *gomatrixserverlib.Transaction {
|
|
oq.runningMutex.Lock()
|
|
defer oq.runningMutex.Unlock()
|
|
|
|
if len(oq.pendingEvents) == 0 && len(oq.pendingEDUs) == 0 {
|
|
oq.running = false
|
|
return nil
|
|
}
|
|
|
|
t := gomatrixserverlib.Transaction{
|
|
PDUs: []json.RawMessage{},
|
|
EDUs: []gomatrixserverlib.EDU{},
|
|
}
|
|
now := gomatrixserverlib.AsTimestamp(time.Now())
|
|
t.TransactionID = gomatrixserverlib.TransactionID(fmt.Sprintf("%d-%d", now, oq.sentCounter))
|
|
t.Origin = oq.origin
|
|
t.Destination = oq.destination
|
|
t.OriginServerTS = now
|
|
t.PreviousIDs = oq.lastTransactionIDs
|
|
if t.PreviousIDs == nil {
|
|
t.PreviousIDs = []gomatrixserverlib.TransactionID{}
|
|
}
|
|
|
|
oq.lastTransactionIDs = []gomatrixserverlib.TransactionID{t.TransactionID}
|
|
|
|
for _, pdu := range oq.pendingEvents {
|
|
// Append the JSON of the event, since this is a json.RawMessage type in the
|
|
// gomatrixserverlib.Transaction struct
|
|
t.PDUs = append(t.PDUs, (*pdu).JSON())
|
|
}
|
|
oq.pendingEvents = nil
|
|
oq.sentCounter += len(t.PDUs)
|
|
|
|
for _, edu := range oq.pendingEDUs {
|
|
t.EDUs = append(t.EDUs, *edu)
|
|
}
|
|
oq.pendingEDUs = nil
|
|
oq.sentCounter += len(t.EDUs)
|
|
|
|
return &t
|
|
}
|