fenix/astontest
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Messaging service, adapters, refactoring

Browse Source
This commit is contained in:
derFenix
2023-12-07 09:00:30 +03:00
parent cf00cfaab6
commit 08a7c9c04f
18 changed files with 623 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/discovery/discoveryset.go Normal file
View File

@@ -0,0 +1,34 @@
package discovery
// DiscoverySet a slice of initialized discovery services.
//
//goland:noinspection GoNameStartsWithPackageName
type DiscoverySet []*Discovery
// NewNodes returns channel with newly discovered node ips.
func (d DiscoverySet) NewNodes() NewNodes {
res := make(chan string, 20)
for _, discovery := range d {
go func(discovery *Discovery) {
for node := range discovery.NewNodes() {
if len(res) == cap(res) {
panic("knownNodes from discovery set not reading!")
}
res <- node
}
}(discovery)
}
return res
}
// FailNodes accept a channel with ip of nodes, that was failed (lost or canceled connection).
func (d DiscoverySet) FailNodes(ch chan string) {
for addr := range ch {
for _, discovery := range d {
discovery.FailNode(addr)
}
}
}

26
pkg/discovery/packet.go Normal file
View File

@@ -0,0 +1,26 @@
package discovery
import (
"bytes"
"net"
)
var magicBytes = []byte{0x01, 0x02, 0x01}
func NewPacket() Packet {
return make(Packet, 7) // 7 = 3 bytes of magic + 4 bytes for ipv4 address
}
func NewPacketWithIP(ip net.IP) Packet {
return append(magicBytes, []byte(ip.To4())...)
}
type Packet []byte
func (p Packet) IP(n int) net.IP {
return net.IP(p[3:n])
}
func (p Packet) MagicOk() bool {
return bytes.Equal(p[:3], magicBytes)
}

114
pkg/discovery/service.go
View File

@@ -2,6 +2,7 @@ package discovery
import (
"context"
"errors"
"fmt"
"net"
"strconv"
@@ -14,30 +15,12 @@ import (
const defaultBroadcastInterval = time.Second
type Nodes map[string]struct{}
type NewNodes <-chan string
//goland:noinspection GoNameStartsWithPackageName
type DiscoverySet []*Discovery
func (d DiscoverySet) NewNodes() NewNodes {
res := make(chan string, 20)
for _, discovery := range d {
go func(discovery *Discovery) {
for node := range discovery.Nodes() {
if len(res) == cap(res) {
panic("nodes from discovery set not reading!")
}
res <- node
}
}(discovery)
}
return res
}
type (
KnownNodes map[string]struct{}
NewNodes <-chan string
)
// NewDiscoverySet returns a set of discovery services for all running and non-loopback network interfaces.
func NewDiscoverySet(log *zap.Logger, discoverPort uint16, opts ...Option) (DiscoverySet, error) {
iFaces, err := net.Interfaces()
if err != nil {
@@ -45,6 +28,7 @@ func NewDiscoverySet(log *zap.Logger, discoverPort uint16, opts ...Option) (Disc
}
set := make(DiscoverySet, 0, len(iFaces))
var errs []error
for _, iFace := range iFaces {
if iFace.Flags&net.FlagLoopback == net.FlagLoopback {
@@ -57,15 +41,22 @@ func NewDiscoverySet(log *zap.Logger, discoverPort uint16, opts ...Option) (Disc
discover, err := NewDiscovery(iFace, log, discoverPort, opts...)
if err != nil {
return nil, fmt.Errorf("new discover for %s: %w", iFace.Name, err)
errs = append(errs, err)
continue
}
set = append(set, discover)
}
if len(set) == 0 {
return nil, errors.Join(errs...)
}
return set, nil
}
// NewDiscovery returns new initialized discovery service for specified network interface.
func NewDiscovery(iFace net.Interface, log *zap.Logger, discoverPort uint16, opts ...Option) (*Discovery, error) {
addrs, err := iFace.Addrs()
if err != nil {
@@ -86,7 +77,7 @@ func NewDiscovery(iFace net.Interface, log *zap.Logger, discoverPort uint16, opt
broadcastIP[i] = ip4[i] | ^ipnet.Mask[i]
}
ownIP = ipnet.IP
ownIP = ip4
break
}
@@ -96,7 +87,7 @@ func NewDiscovery(iFace net.Interface, log *zap.Logger, discoverPort uint16, opt
return nil, fmt.Errorf("no broadcast address")
}
if ownIP.To4() == nil {
if ownIP == nil {
return nil, fmt.Errorf("no own address")
}
@@ -114,9 +105,11 @@ func NewDiscovery(iFace net.Interface, log *zap.Logger, discoverPort uint16, opt
d := Discovery{
log: log.With(zap.Stringer("broadcast_address", broadcastIP)),
nodes: make(Nodes),
knownNodes: make(KnownNodes),
newNodesCh: make(chan string, 20),
failNodesCh: make(chan string),
ownAddr: ownIP.To4(),
ownAddrPacket: NewPacketWithIP(ownIP),
conn: conn,
broadcastAddr: udpAddr,
broadcastInterval: defaultBroadcastInterval,
@@ -129,18 +122,21 @@ func NewDiscovery(iFace net.Interface, log *zap.Logger, discoverPort uint16, opt
return &d, nil
}
// Discovery a service to notify neighbours about yourself and keep track other neighbours alive.
type Discovery struct {
log *zap.Logger
debug bool
mu sync.Mutex
nodes Nodes
newNodesCh chan string
knownNodes KnownNodes
ownAddr net.IP
conn net.PacketConn
broadcastAddr *net.UDPAddr
newNodesCh chan string
failNodesCh chan string
ownAddr net.IP
ownAddrPacket Packet
conn net.PacketConn
broadcastAddr *net.UDPAddr
broadcastInterval time.Duration
}
@@ -162,19 +158,24 @@ func (d *Discovery) Start(ctx context.Context, wg *sync.WaitGroup) {
close(listenStop)
}()
stop := func() {
if err := d.conn.Close(); err != nil {
d.log.Warn("close connection", zap.Error(err))
}
close(d.newNodesCh)
}
for {
select {
case <-ctx.Done():
if err := d.conn.Close(); err != nil {
d.log.Warn("close connection", zap.Error(err))
}
close(d.newNodesCh)
stop()
return
case <-listenStop:
d.log.Error("listener stopped, stop discovery")
stop()
return
@@ -185,10 +186,10 @@ func (d *Discovery) Start(ctx context.Context, wg *sync.WaitGroup) {
}
func (d *Discovery) listen() error {
buf := make([]byte, 4)
packet := NewPacket()
for {
n, addr, err := d.conn.ReadFrom(buf)
readSize, addr, err := d.conn.ReadFrom(packet)
if err != nil {
if strings.Contains(err.Error(), "use of closed network connection") {
d.log.Warn("listen connection closed")
@@ -196,14 +197,20 @@ func (d *Discovery) listen() error {
return nil
}
if opErr, ok := err.(*net.OpError); ok && !opErr.Temporary() {
if opErr, ok := err.(*net.OpError); ok && opErr.Temporary() {
continue
}
return fmt.Errorf("read from: %w", err)
}
nodeAddr := net.IP(buf[:n])
if !packet.MagicOk() {
d.log.Warn("data without magic bytes received")
continue
}
nodeAddr := packet.IP(readSize)
d.log.Debug("received node address", zap.Stringer("address", nodeAddr))
clientIP, _, _ := strings.Cut(addr.String(), ":")
@@ -218,7 +225,7 @@ func (d *Discovery) listen() error {
func (d *Discovery) broadcast() {
d.log.Debug("broadcast")
if _, err := d.conn.WriteTo(d.ownAddr, d.broadcastAddr); err != nil {
if _, err := d.conn.WriteTo(d.ownAddrPacket, d.broadcastAddr); err != nil {
d.log.Error("write broadcast message", zap.Error(err))
}
}
@@ -230,15 +237,32 @@ func (d *Discovery) addNode(addr string) {
d.mu.Lock()
if _, ok := d.nodes[addr]; !ok {
if _, ok := d.knownNodes[addr]; !ok {
d.log.Info("new node address", zap.String("address", addr))
d.nodes[addr] = struct{}{}
d.knownNodes[addr] = struct{}{}
d.newNodesCh <- addr
}
d.mu.Unlock()
}
func (d *Discovery) Nodes() NewNodes {
func (d *Discovery) removeNode(addr string) {
d.mu.Lock()
if _, ok := d.knownNodes[addr]; ok {
d.log.Warn("node failed, removed", zap.String("address", addr))
delete(d.knownNodes, addr)
}
d.mu.Unlock()
}
// NewNodes returns channel with new discovered node addresses.
func (d *Discovery) NewNodes() NewNodes {
return d.newNodesCh
}
// FailNode remove address from list of known nodes. Next broadcast message from this node will be sent to the `NewNodes` channel.
func (d *Discovery) FailNode(addr string) {
d.removeNode(addr)
}

5
pkg/discovery/service_test.go
View File

@@ -17,7 +17,8 @@ func TestIface(t *testing.T) {
ctx, cancel := signal.NotifyContext(context.Background(), os.Kill, os.Interrupt)
t.Cleanup(cancel)
ctx, _ = context.WithTimeout(ctx, time.Second*5)
ctx, cancel = context.WithTimeout(ctx, time.Second*5)
t.Cleanup(cancel)
set, err := NewDiscoverySet(zaptest.NewLogger(t).Named("discovery"), 1234, WithDebug())
require.NoError(t, err)
@@ -34,5 +35,5 @@ func TestIface(t *testing.T) {
}()
wg.Wait()
assert.Len(t, set[0].Nodes(), 1)
assert.Len(t, set[0].NewNodes(), 1)
}