mirror of
https://github.com/element-hq/dendrite.git
synced 2025-09-13 12:52:24 +03:00
Initial Store & Forward Implementation (#2917)
This adds store & forward relays into dendrite for p2p. A few things have changed: - new relay api serves new http endpoints for s&f federation - updated outbound federation queueing which will attempt to forward using s&f if appropriate - database entries to track s&f relays for other nodes
This commit is contained in:
parent
48fa869fa3
commit
5b73592f5a
77 changed files with 7646 additions and 1373 deletions
|
@ -6,14 +6,13 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/matrix-org/gomatrixserverlib"
|
||||
"github.com/matrix-org/util"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/matrix-org/dendrite/federationapi/storage"
|
||||
"github.com/matrix-org/dendrite/setup/config"
|
||||
"github.com/matrix-org/dendrite/test"
|
||||
"github.com/matrix-org/dendrite/test/testrig"
|
||||
"github.com/matrix-org/gomatrixserverlib"
|
||||
"github.com/matrix-org/util"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func mustCreateFederationDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) {
|
||||
|
@ -246,3 +245,99 @@ func TestInboundPeeking(t *testing.T) {
|
|||
assert.ElementsMatch(t, gotPeekIDs, peekIDs)
|
||||
})
|
||||
}
|
||||
|
||||
func TestServersAssumedOffline(t *testing.T) {
|
||||
server1 := gomatrixserverlib.ServerName("server1")
|
||||
server2 := gomatrixserverlib.ServerName("server2")
|
||||
|
||||
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
||||
db, closeDB := mustCreateFederationDatabase(t, dbType)
|
||||
defer closeDB()
|
||||
|
||||
// Set server1 & server2 as assumed offline.
|
||||
err := db.SetServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
err = db.SetServerAssumedOffline(context.Background(), server2)
|
||||
assert.Nil(t, err)
|
||||
|
||||
// Ensure both servers are assumed offline.
|
||||
isOffline, err := db.IsServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
assert.True(t, isOffline)
|
||||
isOffline, err = db.IsServerAssumedOffline(context.Background(), server2)
|
||||
assert.Nil(t, err)
|
||||
assert.True(t, isOffline)
|
||||
|
||||
// Set server1 as not assumed offline.
|
||||
err = db.RemoveServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
|
||||
// Ensure both servers have correct state.
|
||||
isOffline, err = db.IsServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
assert.False(t, isOffline)
|
||||
isOffline, err = db.IsServerAssumedOffline(context.Background(), server2)
|
||||
assert.Nil(t, err)
|
||||
assert.True(t, isOffline)
|
||||
|
||||
// Re-set server1 as assumed offline.
|
||||
err = db.SetServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
|
||||
// Ensure server1 is assumed offline.
|
||||
isOffline, err = db.IsServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
assert.True(t, isOffline)
|
||||
|
||||
err = db.RemoveAllServersAssumedOffline(context.Background())
|
||||
assert.Nil(t, err)
|
||||
|
||||
// Ensure both servers have correct state.
|
||||
isOffline, err = db.IsServerAssumedOffline(context.Background(), server1)
|
||||
assert.Nil(t, err)
|
||||
assert.False(t, isOffline)
|
||||
isOffline, err = db.IsServerAssumedOffline(context.Background(), server2)
|
||||
assert.Nil(t, err)
|
||||
assert.False(t, isOffline)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRelayServersStored(t *testing.T) {
|
||||
server := gomatrixserverlib.ServerName("server")
|
||||
relayServer1 := gomatrixserverlib.ServerName("relayserver1")
|
||||
relayServer2 := gomatrixserverlib.ServerName("relayserver2")
|
||||
|
||||
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
|
||||
db, closeDB := mustCreateFederationDatabase(t, dbType)
|
||||
defer closeDB()
|
||||
|
||||
err := db.P2PAddRelayServersForServer(context.Background(), server, []gomatrixserverlib.ServerName{relayServer1})
|
||||
assert.Nil(t, err)
|
||||
|
||||
relayServers, err := db.P2PGetRelayServersForServer(context.Background(), server)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, relayServer1, relayServers[0])
|
||||
|
||||
err = db.P2PRemoveRelayServersForServer(context.Background(), server, []gomatrixserverlib.ServerName{relayServer1})
|
||||
assert.Nil(t, err)
|
||||
|
||||
relayServers, err = db.P2PGetRelayServersForServer(context.Background(), server)
|
||||
assert.Nil(t, err)
|
||||
assert.Zero(t, len(relayServers))
|
||||
|
||||
err = db.P2PAddRelayServersForServer(context.Background(), server, []gomatrixserverlib.ServerName{relayServer1, relayServer2})
|
||||
assert.Nil(t, err)
|
||||
|
||||
relayServers, err = db.P2PGetRelayServersForServer(context.Background(), server)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, relayServer1, relayServers[0])
|
||||
assert.Equal(t, relayServer2, relayServers[1])
|
||||
|
||||
err = db.P2PRemoveAllRelayServersForServer(context.Background(), server)
|
||||
assert.Nil(t, err)
|
||||
|
||||
relayServers, err = db.P2PGetRelayServersForServer(context.Background(), server)
|
||||
assert.Nil(t, err)
|
||||
assert.Zero(t, len(relayServers))
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue