mirror of
https://github.com/siderolabs/discovery-service.git
synced 2025-03-14 09:55:08 +00:00
add redis database backend
Signed-off-by: Seán C McCord <ulexus@gmail.com>
This commit is contained in:
Seán C McCord
121
db/db.go
121
db/db.go
@ -1,42 +1,53 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/talos-systems/wglan-manager/types"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
// AddressExpirationTimeout is the amount of time after which addresses of a node should be expired.
|
||||
const AddressExpirationTimeout = 10 * time.Minute
|
||||
|
||||
type DB interface {
|
||||
// Add adds a set of known Endpoints to a node, creating the node, if it does not exist.
|
||||
Add(cluster string, n *types.Node) error
|
||||
// Add adds a set of known Endpoints to a node, creating the node, if it does not exist.
|
||||
Add(ctx context.Context, cluster string, n *types.Node) error
|
||||
|
||||
// AddAddresses adds a set of addresses for a node.
|
||||
AddAddresses(cluster string, id string, ep ...*types.Address) error
|
||||
AddAddresses(ctx context.Context, cluster string, id string, ep ...*types.Address) error
|
||||
|
||||
// Get returns the details of the node.
|
||||
Get(cluster string, id string) (*types.Node,error)
|
||||
// Clean executes a database cleanup routine.
|
||||
Clean()
|
||||
|
||||
// Get returns the details of the node.
|
||||
Get(ctx context.Context, cluster string, id string) (*types.Node, error)
|
||||
|
||||
// List returns the set of Nodes for the given Cluster.
|
||||
List(cluster string) ([]*types.Node,error)
|
||||
List(ctx context.Context, cluster string) ([]*types.Node, error)
|
||||
}
|
||||
|
||||
type ramDB struct {
|
||||
db map[string]map[string]*types.Node
|
||||
mu sync.RWMutex
|
||||
logger *zap.Logger
|
||||
db map[string]map[string]*types.Node
|
||||
mu sync.RWMutex
|
||||
}
|
||||
|
||||
// New returns a new database.
|
||||
func New() DB {
|
||||
return &ramDB{
|
||||
db: make(map[string]map[string]*types.Node),
|
||||
}
|
||||
func New(logger *zap.Logger) DB {
|
||||
return &ramDB{
|
||||
logger: logger,
|
||||
db: make(map[string]map[string]*types.Node),
|
||||
}
|
||||
}
|
||||
|
||||
// Add implements DB
|
||||
func (d *ramDB) Add(cluster string, n *types.Node) error {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
func (d *ramDB) Add(ctx context.Context, cluster string, n *types.Node) error {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
|
||||
c, ok := d.db[cluster]
|
||||
if !ok {
|
||||
@ -44,69 +55,101 @@ func (d *ramDB) Add(cluster string, n *types.Node) error {
|
||||
d.db[cluster] = c
|
||||
}
|
||||
|
||||
if existing, ok := c[n.ID]; ok {
|
||||
if existing, ok := c[n.ID]; ok {
|
||||
existing.AddAddresses(n.Addresses...)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
c[n.ID] = n
|
||||
c[n.ID] = n
|
||||
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *ramDB) AddAddresses(cluster string, id string, addresses ...*types.Address) error {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
func (d *ramDB) AddAddresses(ctx context.Context, cluster string, id string, addresses ...*types.Address) error {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
|
||||
c, ok := d.db[cluster]
|
||||
if !ok {
|
||||
return fmt.Errorf("cluster does not exist")
|
||||
}
|
||||
|
||||
n, ok := c[id]
|
||||
if !ok {
|
||||
n, ok := c[id]
|
||||
if !ok {
|
||||
return fmt.Errorf("node does not exist")
|
||||
}
|
||||
}
|
||||
|
||||
n.AddAddresses(addresses...)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *ramDB) List(cluster string) (list []*types.Node, err error) {
|
||||
func (d *ramDB) List(ctx context.Context, cluster string) (list []*types.Node, err error) {
|
||||
c, ok := d.db[cluster]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("cluster %q not found", cluster)
|
||||
}
|
||||
|
||||
var i int
|
||||
|
||||
list = make([]*types.Node, len(c))
|
||||
|
||||
for _, n := range c {
|
||||
list[i] = n
|
||||
n.ExpireAddressesOlderThan(AddressExpirationTimeout)
|
||||
|
||||
i++
|
||||
if len(n.Addresses) > 0 {
|
||||
list = append(list, n)
|
||||
}
|
||||
}
|
||||
|
||||
return list, nil
|
||||
}
|
||||
|
||||
// Get implements DB
|
||||
func (d *ramDB) Get(cluster string, id string) (*types.Node,error) {
|
||||
d.mu.RLock()
|
||||
defer d.mu.Unlock()
|
||||
func (d *ramDB) Get(ctx context.Context, cluster string, id string) (*types.Node, error) {
|
||||
d.mu.RLock()
|
||||
defer d.mu.Unlock()
|
||||
|
||||
c, ok := d.db[cluster]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("cluster %q not found", cluster)
|
||||
}
|
||||
|
||||
n, ok := c[id]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("node %q in cluster %q not found", id, cluster)
|
||||
}
|
||||
n, ok := c[id]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("node %q in cluster %q not found", id, cluster)
|
||||
}
|
||||
|
||||
return n, nil
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// Clean runs the database cleanup routine.
|
||||
func (d *ramDB) Clean() {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
|
||||
var clusterDeleteList []string
|
||||
|
||||
for clusterID, c := range d.db {
|
||||
var nodeDeleteList []string
|
||||
|
||||
for id, n := range c {
|
||||
|
||||
n.ExpireAddressesOlderThan(AddressExpirationTimeout)
|
||||
|
||||
if len(n.Addresses) < 1 {
|
||||
nodeDeleteList = append(nodeDeleteList, id)
|
||||
}
|
||||
}
|
||||
|
||||
for _, id := range nodeDeleteList {
|
||||
c[id] = nil
|
||||
delete(c, id)
|
||||
}
|
||||
|
||||
if len(c) < 0 {
|
||||
clusterDeleteList = append(clusterDeleteList, clusterID)
|
||||
}
|
||||
}
|
||||
|
||||
for _, id := range clusterDeleteList {
|
||||
delete(d.db, id)
|
||||
}
|
||||
}
|
||||
|
||||
162
db/redis.go
Normal file
162
db/redis.go
Normal file
@ -0,0 +1,162 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/go-redis/redis/v8"
|
||||
"github.com/talos-systems/wglan-manager/types"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
const redisTTL = 12 * time.Minute
|
||||
|
||||
type redisDB struct {
|
||||
logger *zap.Logger
|
||||
|
||||
rc *redis.Client
|
||||
}
|
||||
|
||||
func NewRedis(addr string, logger *zap.Logger) (DB, error) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 10 * time.Second)
|
||||
defer cancel()
|
||||
|
||||
rc := redis.NewClient(&redis.Options{
|
||||
Addr: addr,
|
||||
})
|
||||
|
||||
if err := rc.Ping(ctx).Err(); err != nil {
|
||||
return nil, fmt.Errorf("failed to connect to redis: %w", err)
|
||||
}
|
||||
|
||||
return &redisDB{
|
||||
rc: rc,
|
||||
logger: logger,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (d *redisDB) clusterNodesKey(cluster string) string {
|
||||
return fmt.Sprintf("cluster:%s:nodelist", cluster)
|
||||
}
|
||||
|
||||
func (d *redisDB) clusterNodeKey(cluster, id string) string {
|
||||
return fmt.Sprintf("cluster:%s:node:%s", cluster, id)
|
||||
}
|
||||
|
||||
func (d *redisDB) clusterAddressKey(cluster string, addr *types.Address) string {
|
||||
if !addr.IP.IsZero() {
|
||||
return fmt.Sprintf("cluster:%s:address:%s", cluster, addr.IP.String())
|
||||
}
|
||||
|
||||
return fmt.Sprintf("cluster:%s:address:%s", cluster, addr.Name)
|
||||
}
|
||||
|
||||
// Add implements db.DB
|
||||
func (d *redisDB) Add(ctx context.Context, cluster string, n *types.Node) error {
|
||||
tx := d.rc.TxPipeline()
|
||||
|
||||
// Store the node data
|
||||
tx.Set(ctx, d.clusterNodeKey(cluster, n.ID), n, redisTTL)
|
||||
|
||||
// Add the node to the cluster
|
||||
if err := tx.SAdd(ctx, d.clusterNodesKey(cluster), n.ID).Err(); err != nil {
|
||||
return fmt.Errorf("failed to add node %s to cluster %q: %w", n.Name, cluster, err)
|
||||
}
|
||||
|
||||
tx.Expire(ctx, d.clusterNodesKey(cluster), redisTTL)
|
||||
|
||||
// Update the address assignments
|
||||
for _, addr := range n.Addresses {
|
||||
tx.Set(ctx, d.clusterAddressKey(cluster, addr), n.ID, redisTTL)
|
||||
}
|
||||
|
||||
_, err := tx.Exec(ctx)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// AddAddresses implements db.DB
|
||||
func (d *redisDB) AddAddresses(ctx context.Context, cluster string, id string, ep ...*types.Address) error {
|
||||
n, err := d.Get(ctx, cluster, id)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to retrieve node %q from cluster %q: %w", id, cluster, err)
|
||||
}
|
||||
|
||||
n.AddAddresses(ep...)
|
||||
|
||||
return d.Add(ctx, cluster, n)
|
||||
}
|
||||
|
||||
// Clean implements db.DB
|
||||
func (d *redisDB) Clean() {
|
||||
return // no-op
|
||||
}
|
||||
|
||||
// Get implements db.DB
|
||||
func (d *redisDB) Get(ctx context.Context, cluster string, id string) (*types.Node, error) {
|
||||
n := new(types.Node)
|
||||
|
||||
if err := d.rc.Get(ctx, d.clusterNodeKey(cluster, id)).Scan(n); err != nil {
|
||||
if errors.Is(redis.Nil, err) {
|
||||
return nil, err
|
||||
}
|
||||
return nil, fmt.Errorf("failed to parse node %q of cluster %q: %w", id, cluster, err)
|
||||
}
|
||||
|
||||
var validAddresses []*types.Address
|
||||
|
||||
for _, a := range n.Addresses {
|
||||
owner, err := d.rc.Get(ctx, d.clusterAddressKey(cluster, a)).Result()
|
||||
if err == nil && owner == id {
|
||||
validAddresses = append(validAddresses, a)
|
||||
}
|
||||
}
|
||||
|
||||
n.Addresses = validAddresses
|
||||
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// List implements db.DB
|
||||
func (d *redisDB) List(ctx context.Context, cluster string) ([]*types.Node, error) {
|
||||
nodeList, err := d.rc.SMembers(ctx, d.clusterNodesKey(cluster)).Result()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get members of cluster %q: %w", cluster, err)
|
||||
}
|
||||
|
||||
var ret []*types.Node
|
||||
|
||||
for _, id := range nodeList {
|
||||
n, err := d.Get(ctx, cluster, id)
|
||||
if err != nil {
|
||||
if errors.Is(redis.Nil, err) {
|
||||
d.logger.Debug("removing stale node from cluster",
|
||||
zap.String("node", id),
|
||||
zap.String("cluster", cluster),
|
||||
)
|
||||
|
||||
if err = d.rc.SRem(ctx, d.clusterNodesKey(cluster), id).Err(); err != nil {
|
||||
d.logger.Warn("failed to remove node from cluster set which did not exist",
|
||||
zap.String("node", id),
|
||||
zap.String("cluster", cluster),
|
||||
zap.Error(err),
|
||||
)
|
||||
}
|
||||
} else {
|
||||
d.logger.Error("failed to get node listen in nodeList",
|
||||
zap.String("node", id),
|
||||
zap.String("cluster", cluster),
|
||||
zap.Error(err),
|
||||
)
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
ret = append(ret, n)
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
1
go.mod
1
go.mod
@ -3,6 +3,7 @@ module github.com/talos-systems/wglan-manager
|
||||
go 1.16
|
||||
|
||||
require (
|
||||
github.com/go-redis/redis/v8 v8.11.2
|
||||
github.com/gofiber/fiber/v2 v2.8.0
|
||||
go.uber.org/zap v1.16.0
|
||||
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 // indirect
|
||||
|
||||
58
go.sum
58
go.sum
@ -2,13 +2,34 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
|
||||
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
|
||||
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||
github.com/go-redis/redis/v8 v8.11.2 h1:WqlSpAwz8mxDSMCvbyz1Mkiqe0LE5OY4j3lgkvu1Ts0=
|
||||
github.com/go-redis/redis/v8 v8.11.2/go.mod h1:DLomh7y2e3ggQXQLd1YgmvIfecPJoFl7WU5SOQ/r06M=
|
||||
github.com/gofiber/fiber/v2 v2.8.0 h1:BdWvZmg/WY/Vjtjm38aXOp1Lks1BhuyS2b7lSWSPAzk=
|
||||
github.com/gofiber/fiber/v2 v2.8.0/go.mod h1:Ah3IJikrKNRepl/HuVawppS25X7FWohwfCSRn7kJG28=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/klauspost/compress v1.11.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
|
||||
github.com/klauspost/compress v1.11.13 h1:eSvu8Tmq6j2psUJqJrLcWH6K3w5Dwc+qipbaA6eVEN4=
|
||||
@ -16,6 +37,16 @@ github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
|
||||
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
||||
github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
|
||||
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
|
||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
||||
github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
|
||||
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
@ -55,18 +86,29 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
|
||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
||||
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||
golang.org/x/net v0.0.0-20210226101413-39120d07d75e h1:jIQURUJ9mlLvYwTBtRHm9h58rYhSonLvRvgAnP8Nr7I=
|
||||
golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 h1:cdsMqa2nXzqlgs183pHxtvoVwU7CyzaCTAUOg94af4c=
|
||||
@ -75,6 +117,7 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
|
||||
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
@ -82,17 +125,30 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw
|
||||
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
|
||||
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
|
||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
inet.af/netaddr v0.0.0-20210525141459-c0eff8545de6 h1:Bf++HvcnBFYGQjFx1qhW/3uTMQbv+bfKB6gdEN7JvvM=
|
||||
|
||||
99
main.go
99
main.go
@ -5,6 +5,7 @@ import (
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/talos-systems/wglan-manager/db"
|
||||
@ -25,7 +26,7 @@ func init() {
|
||||
}
|
||||
|
||||
func main() {
|
||||
|
||||
|
||||
flag.Parse()
|
||||
|
||||
logger, err := zap.NewProduction()
|
||||
@ -43,9 +44,17 @@ func main() {
|
||||
|
||||
defer logger.Sync() // nolint: errcheck
|
||||
|
||||
nodeDB = db.New()
|
||||
if os.Getenv("REDIS_ADDR") != "" {
|
||||
nodeDB, err = db.NewRedis(os.Getenv("REDIS_ADDR"), logger)
|
||||
if err != nil {
|
||||
log.Fatalln("failed to connect to redis: %w", err)
|
||||
}
|
||||
|
||||
app := fiber.New()
|
||||
} else {
|
||||
nodeDB = db.New(logger)
|
||||
}
|
||||
|
||||
app := fiber.New()
|
||||
|
||||
app.Get("/:cluster", func(c *fiber.Ctx) error {
|
||||
cluster := c.Params("cluster")
|
||||
@ -54,23 +63,23 @@ func main() {
|
||||
return c.SendStatus(http.StatusBadRequest)
|
||||
}
|
||||
|
||||
list, err := nodeDB.List(cluster)
|
||||
if len(list) < 1 {
|
||||
list, err := nodeDB.List(c.Context(), cluster)
|
||||
if len(list) < 1 {
|
||||
logger.Warn("cluster not found",
|
||||
zap.String("cluster", cluster),
|
||||
zap.Error(err),
|
||||
)
|
||||
return c.SendStatus(http.StatusNotFound)
|
||||
}
|
||||
return c.SendStatus(http.StatusNotFound)
|
||||
}
|
||||
|
||||
logger.Info("listing cluster nodes",
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.Int("count", len(list)),
|
||||
)
|
||||
|
||||
return c.JSON(list)
|
||||
return c.JSON(list)
|
||||
|
||||
})
|
||||
})
|
||||
|
||||
app.Get("/:cluster/:node", func(c *fiber.Ctx) error {
|
||||
cluster := c.Params("cluster", "")
|
||||
@ -87,17 +96,17 @@ func main() {
|
||||
return c.SendStatus(http.StatusBadRequest)
|
||||
}
|
||||
|
||||
n, err := nodeDB.Get(cluster, node)
|
||||
if err != nil {
|
||||
n, err := nodeDB.Get(c.Context(), cluster, node)
|
||||
if err != nil {
|
||||
logger.Warn("node not found",
|
||||
zap.String("cluster", cluster),
|
||||
zap.String("node", node),
|
||||
zap.Error(err),
|
||||
)
|
||||
return c.SendStatus(http.StatusNotFound)
|
||||
}
|
||||
return c.SendStatus(http.StatusNotFound)
|
||||
}
|
||||
|
||||
logger.Error("returning cluster node",
|
||||
logger.Info("returning cluster node",
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.String("node", n.ID),
|
||||
zap.String("ip", n.IP.String()),
|
||||
@ -105,8 +114,8 @@ func main() {
|
||||
zap.Error(err),
|
||||
)
|
||||
|
||||
return c.JSON(n)
|
||||
})
|
||||
return c.JSON(n)
|
||||
})
|
||||
|
||||
// PUT addresses to a Node
|
||||
app.Put("/:cluster/:node", func(c *fiber.Ctx) error {
|
||||
@ -130,31 +139,31 @@ func main() {
|
||||
)
|
||||
}
|
||||
|
||||
if err := nodeDB.AddAddresses(c.Params("cluster", ""), node, addresses...); err != nil {
|
||||
if err := nodeDB.AddAddresses(c.Context(), c.Params("cluster", ""), node, addresses...); err != nil {
|
||||
logger.Error("failed to add known endpoints",
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.String("node", node),
|
||||
zap.Strings("addresses", addressToString(addresses)),
|
||||
zap.Error(err),
|
||||
)
|
||||
return c.SendStatus(http.StatusInternalServerError)
|
||||
return c.SendStatus(http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
return c.SendStatus(http.StatusNoContent)
|
||||
return c.SendStatus(http.StatusNoContent)
|
||||
})
|
||||
|
||||
app.Post("/:cluster", func(c *fiber.Ctx) error {
|
||||
n := new(types.Node)
|
||||
app.Post("/:cluster", func(c *fiber.Ctx) error {
|
||||
n := new(types.Node)
|
||||
|
||||
if err := c.BodyParser(n); err != nil {
|
||||
if err := c.BodyParser(n); err != nil {
|
||||
logger.Error("failed to parse node POST",
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.Error(err),
|
||||
)
|
||||
return c.SendStatus(http.StatusBadRequest)
|
||||
}
|
||||
return c.SendStatus(http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if err := nodeDB.Add(c.Params("cluster", ""), n); err != nil {
|
||||
if err := nodeDB.Add(c.Context(), c.Params("cluster", ""), n); err != nil {
|
||||
logger.Error("failed to add/update node",
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.String("node", n.ID),
|
||||
@ -162,35 +171,41 @@ func main() {
|
||||
zap.Strings("addresses", addressToString(n.Addresses)),
|
||||
zap.Error(err),
|
||||
)
|
||||
return c.SendStatus(http.StatusInternalServerError)
|
||||
}
|
||||
return c.SendStatus(http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
logger.Info("add/update node",
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.String("node", n.ID),
|
||||
zap.String("ip", n.IP.String()),
|
||||
zap.Strings("addresses", addressToString(n.Addresses)),
|
||||
zap.String("cluster", c.Params("cluster", "")),
|
||||
zap.String("node", n.ID),
|
||||
zap.String("ip", n.IP.String()),
|
||||
zap.Strings("addresses", addressToString(n.Addresses)),
|
||||
)
|
||||
|
||||
return c.SendStatus(http.StatusNoContent)
|
||||
})
|
||||
return c.SendStatus(http.StatusNoContent)
|
||||
})
|
||||
|
||||
go func() {
|
||||
for {
|
||||
time.Sleep(time.Hour)
|
||||
|
||||
nodeDB.Clean()
|
||||
}
|
||||
}()
|
||||
logger.Fatal("listen exited",
|
||||
zap.Error(app.Listen(listenAddr)),
|
||||
)
|
||||
}
|
||||
|
||||
func addressToString(addresses []*types.Address) (out []string) {
|
||||
for _, a := range addresses {
|
||||
ep, err := a.Endpoint(defaultPort)
|
||||
if err != nil {
|
||||
out = append(out, err.Error())
|
||||
for _, a := range addresses {
|
||||
if !a.IP.IsZero() {
|
||||
out = append(out, a.IP.String())
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
out = append(out, ep.String())
|
||||
continue
|
||||
}
|
||||
|
||||
return out
|
||||
out = append(out, a.Name)
|
||||
}
|
||||
|
||||
return out
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package types
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net"
|
||||
"sync"
|
||||
@ -11,17 +12,17 @@ import (
|
||||
|
||||
// Address describes an IP or DNS address with optional Port.
|
||||
type Address struct {
|
||||
// DNSName is the DNS name of this NodeAddress, if known.
|
||||
Name string
|
||||
// Name is the DNS name of this NodeAddress, if known.
|
||||
Name string `json:"name,omitempty"`
|
||||
|
||||
// IP is the IP address of this NodeAddress, if known.
|
||||
IP netaddr.IP
|
||||
IP netaddr.IP `json:"ip,omitempty"`
|
||||
|
||||
// Port is the port number for this NodeAddress, if known.
|
||||
Port uint16
|
||||
Port uint16 `json:"port,omitempty"`
|
||||
|
||||
// LastReported indicates the time at which this address was last reported.
|
||||
LastReported time.Time
|
||||
LastReported time.Time `json:"lastReported"`
|
||||
}
|
||||
|
||||
// EqualHost indicates whether two addresses have the same host portion, ignoring the ports.
|
||||
@ -139,3 +140,15 @@ func (n *Node) ExpireAddressesOlderThan(maxAge time.Duration) {
|
||||
|
||||
n.Addresses = n.Addresses[:i]
|
||||
}
|
||||
|
||||
// MarshalBinary implements encoding.BinaryMarshaler
|
||||
func (n *Node) MarshalBinary() ([]byte, error) {
|
||||
return json.Marshal(n)
|
||||
}
|
||||
|
||||
// UnmarshalBinary implements encoding.BinaryUnmarshaler
|
||||
func (n *Node) UnmarshalBinary(data []byte) error {
|
||||
*n = Node{}
|
||||
|
||||
return json.Unmarshal(data, n)
|
||||
}
|
||||
|
||||
43
types/types_test.go
Normal file
43
types/types_test.go
Normal file
@ -0,0 +1,43 @@
|
||||
package types_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/talos-systems/wglan-manager/types"
|
||||
"inet.af/netaddr"
|
||||
)
|
||||
|
||||
func TestEncoderDecoder(t *testing.T) {
|
||||
n := &types.Node{
|
||||
Name: "tester",
|
||||
ID: "IHOPEfmiUG1kE832FAxm77J5WP0O1ZHp9OwqbGowL1E=",
|
||||
IP: netaddr.MustParseIP("2001:db8:1001::1"),
|
||||
Addresses: []*types.Address{
|
||||
{
|
||||
Name: "mynode.mydomain.com",
|
||||
Port: 51512,
|
||||
LastReported: time.Now(),
|
||||
},
|
||||
{
|
||||
IP: netaddr.MustParseIP("2001:db8:2002::2"),
|
||||
Port: 52522,
|
||||
LastReported: time.Now(),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
data, err := n.MarshalBinary()
|
||||
if err != nil {
|
||||
t.Errorf("failed to marshal node: %w", err)
|
||||
}
|
||||
|
||||
n2 := new(types.Node)
|
||||
if err = n2.UnmarshalBinary(data); err != nil {
|
||||
t.Errorf("failed to unmarshal node: %w", err)
|
||||
}
|
||||
|
||||
if n.ID != n2.ID {
|
||||
t.Errorf("IDs do not match: %s != %s", n.ID, n2.ID)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user