mirror of
https://github.com/netbirdio/netbird.git
synced 2025-03-12 22:02:43 +01:00
Add memory flow store (#3386)
This commit is contained in:
parent
1e534cecf6
commit
175674749f
@ -33,6 +33,7 @@ import (
|
||||
"github.com/netbirdio/netbird/client/internal/acl"
|
||||
"github.com/netbirdio/netbird/client/internal/dns"
|
||||
"github.com/netbirdio/netbird/client/internal/dnsfwd"
|
||||
"github.com/netbirdio/netbird/client/internal/flowstore"
|
||||
"github.com/netbirdio/netbird/client/internal/ingressgw"
|
||||
"github.com/netbirdio/netbird/client/internal/networkmonitor"
|
||||
"github.com/netbirdio/netbird/client/internal/peer"
|
||||
@ -189,6 +190,7 @@ type Engine struct {
|
||||
persistNetworkMap bool
|
||||
latestNetworkMap *mgmProto.NetworkMap
|
||||
connSemaphore *semaphoregroup.SemaphoreGroup
|
||||
flowStore flowstore.Store
|
||||
}
|
||||
|
||||
// Peer is an instance of the Connection Peer
|
||||
@ -320,6 +322,13 @@ func (e *Engine) Stop() error {
|
||||
log.Errorf("failed to persist state: %v", err)
|
||||
}
|
||||
|
||||
if e.flowStore != nil {
|
||||
if err := e.flowStore.Close(); err != nil {
|
||||
e.flowStore = nil
|
||||
log.Errorf("failed to close flow store: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -642,25 +651,14 @@ func (e *Engine) handleSync(update *mgmProto.SyncResponse) error {
|
||||
stunTurn = append(stunTurn, e.TURNs...)
|
||||
e.stunTurn.Store(stunTurn)
|
||||
|
||||
relayMsg := wCfg.GetRelay()
|
||||
if relayMsg != nil {
|
||||
// when we receive token we expect valid address list too
|
||||
c := &auth.Token{
|
||||
Payload: relayMsg.GetTokenPayload(),
|
||||
Signature: relayMsg.GetTokenSignature(),
|
||||
}
|
||||
if err := e.relayManager.UpdateToken(c); err != nil {
|
||||
log.Errorf("failed to update relay token: %v", err)
|
||||
return fmt.Errorf("update relay token: %w", err)
|
||||
}
|
||||
err = e.handleRelayUpdate(wCfg.GetRelay())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
e.relayManager.UpdateServerURLs(relayMsg.Urls)
|
||||
|
||||
// Just in case the agent started with an MGM server where the relay was disabled but was later enabled.
|
||||
// We can ignore all errors because the guard will manage the reconnection retries.
|
||||
_ = e.relayManager.Serve()
|
||||
} else {
|
||||
e.relayManager.UpdateServerURLs(nil)
|
||||
err = e.handleFlowUpdate(wCfg.GetFlow())
|
||||
if err != nil {
|
||||
return fmt.Errorf("handle the flow configuration: %w", err)
|
||||
}
|
||||
|
||||
// todo update signal
|
||||
@ -691,6 +689,47 @@ func (e *Engine) handleSync(update *mgmProto.SyncResponse) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *Engine) handleRelayUpdate(update *mgmProto.RelayConfig) error {
|
||||
if update != nil {
|
||||
// when we receive token we expect valid address list too
|
||||
c := &auth.Token{
|
||||
Payload: update.GetTokenPayload(),
|
||||
Signature: update.GetTokenSignature(),
|
||||
}
|
||||
if err := e.relayManager.UpdateToken(c); err != nil {
|
||||
return fmt.Errorf("update relay token: %w", err)
|
||||
}
|
||||
|
||||
e.relayManager.UpdateServerURLs(update.Urls)
|
||||
|
||||
// Just in case the agent started with an MGM server where the relay was disabled but was later enabled.
|
||||
// We can ignore all errors because the guard will manage the reconnection retries.
|
||||
_ = e.relayManager.Serve()
|
||||
} else {
|
||||
e.relayManager.UpdateServerURLs(nil)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *Engine) handleFlowUpdate(update *mgmProto.FlowConfig) error {
|
||||
if update == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if update.GetEnabled() && e.flowStore == nil {
|
||||
e.flowStore = flowstore.New(e.ctx)
|
||||
return nil
|
||||
}
|
||||
|
||||
if !update.GetEnabled() && e.flowStore != nil {
|
||||
err := e.flowStore.Close()
|
||||
e.flowStore = nil
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// updateChecksIfNew updates checks if there are changes and sync new meta with management
|
||||
func (e *Engine) updateChecksIfNew(checks []*mgmProto.Checks) error {
|
||||
// if checks are equal, we skip the update
|
||||
|
79
client/internal/flowstore/store.go
Normal file
79
client/internal/flowstore/store.go
Normal file
@ -0,0 +1,79 @@
|
||||
package flowstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"sync"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type Event struct {
|
||||
ID string
|
||||
FlowID string
|
||||
}
|
||||
|
||||
type Store interface {
|
||||
io.Closer
|
||||
// stores a flow event
|
||||
StoreEvent(flowEvent Event)
|
||||
// returns all stored events
|
||||
GetEvents() []*Event
|
||||
}
|
||||
|
||||
func New(ctx context.Context) Store {
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
store := &memory{
|
||||
events: make(map[string]*Event),
|
||||
rcvChan: make(chan *Event, 100),
|
||||
ctx: ctx,
|
||||
cancel: cancel,
|
||||
}
|
||||
go store.startReceiver()
|
||||
return store
|
||||
}
|
||||
|
||||
type memory struct {
|
||||
mux sync.Mutex
|
||||
events map[string]*Event
|
||||
rcvChan chan *Event
|
||||
ctx context.Context
|
||||
cancel context.CancelFunc
|
||||
}
|
||||
|
||||
func (m *memory) startReceiver() {
|
||||
for {
|
||||
select {
|
||||
case <-m.ctx.Done():
|
||||
log.Info("flow memory store receiver stopped")
|
||||
return
|
||||
case event := <-m.rcvChan:
|
||||
m.mux.Lock()
|
||||
m.events[event.ID] = event
|
||||
m.mux.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *memory) StoreEvent(flowEvent Event) {
|
||||
select {
|
||||
case m.rcvChan <- &flowEvent:
|
||||
default:
|
||||
log.Warn("flow memory store receiver is busy")
|
||||
}
|
||||
}
|
||||
|
||||
func (m *memory) Close() error {
|
||||
m.cancel()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *memory) GetEvents() []*Event {
|
||||
m.mux.Lock()
|
||||
defer m.mux.Unlock()
|
||||
events := make([]*Event, 0, len(m.events))
|
||||
for _, event := range m.events {
|
||||
events = append(events, event)
|
||||
}
|
||||
return events
|
||||
}
|
28
client/internal/flowstore/store_test.go
Normal file
28
client/internal/flowstore/store_test.go
Normal file
@ -0,0 +1,28 @@
|
||||
package flowstore_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/netbirdio/netbird/client/internal/flowstore"
|
||||
)
|
||||
|
||||
func TestStore(t *testing.T) {
|
||||
store := flowstore.New(context.Background())
|
||||
t.Cleanup(func() {
|
||||
store.Close()
|
||||
})
|
||||
|
||||
event := flowstore.Event{
|
||||
ID: "1",
|
||||
FlowID: "1",
|
||||
}
|
||||
|
||||
store.StoreEvent(event)
|
||||
allEvents := store.GetEvents()
|
||||
for _, e := range allEvents {
|
||||
if e.ID != event.ID {
|
||||
t.Errorf("expected event ID %s, got %s", event.ID, e.ID)
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user