homelab/hivemind
1
0
Fork 0
Code Activity

chore: unify naming for node related types

Browse source
This commit is contained in:
Arthur K. 2026-01-18 01:08:52 +03:00
parent bbee40ec98
commit 4d44012d06
Signed by: wzray
GPG key ID: B97F30FDC4636357
12 changed files with 72 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/config/node.go
View file

@ -3,6 +3,7 @@ package config
import (
"errors"
"fmt"
"net"
"strings"
)
@ -28,29 +29,34 @@ func (l *LogLevel) UnmarshalText(data []byte) error {
}
type NodeConfig struct {
Hostname string `toml:"hostname"`
Endpoint string `toml:"endpoint"`
Hostname string `toml:"hostname"`
Address string `toml:"address"`
Port int `toml:"port"`
KeepaliveInterval int `toml:"keepalive_interval"`
LogLevel LogLevel `toml:"log_level"`
BootstrapMaster string `toml:"bootstrap_master"`
ListenOn string `toml:"listen_on"`
Port int `toml:"port"`
}
func (c NodeConfig) Validate() error {
if c.Address == "" {
return errors.New("missing address")
}
if c.Hostname == "" {
return errors.New("missing hostname")
}
if c.Endpoint == "" {
return errors.New("missing endpoint")
}
if c.KeepaliveInterval < 1 && c.KeepaliveInterval != -1 {
return errors.New("invalid keepalive_interval")
}
if net.ParseIP(c.ListenOn) == nil {
return errors.New("invalid listen_on")
}
return nil
}
@ -59,8 +65,8 @@ func (c *NodeConfig) Merge(other NodeConfig) {
c.Hostname = other.Hostname
}
if other.Endpoint != "" {
c.Endpoint = other.Endpoint
if other.Address != "" {
c.Address = other.Address
}
if other.BootstrapMaster != "" {

10
internal/registry/registry.go
View file

@ -36,7 +36,7 @@ func New(storage Storage, self types.Node) *Registry {
r.nodes = storedData.Nodes
ret:
r.nodes[self.Name] = self
r.nodes[self.Hostname] = self
return r
}
@ -68,7 +68,7 @@ func (r *Registry) AllNodes() []types.Node {
func (r *Registry) Nodes() []types.Node {
nodes := r.AllNodes()
nodes = slices.DeleteFunc(nodes, func(n types.Node) bool {
return n.Name == r.self.Name
return n.Hostname == r.self.Hostname
})
return nodes
}
@ -79,7 +79,7 @@ func (r *Registry) ByRole(role types.Role) []types.Node {
o := make([]types.Node, 0, len(r.nodes))
for _, node := range r.nodes {
if slices.Contains(node.Roles, role) && node.Name != r.self.Name {
if slices.Contains(node.Roles, role) && node.Hostname != r.self.Hostname {
o = append(o, node)
}
}
@ -88,7 +88,7 @@ func (r *Registry) ByRole(role types.Role) []types.Node {
func (r *Registry) AddNode(node types.Node) error {
r.lock.Lock()
r.nodes[node.Name] = node
r.nodes[node.Hostname] = node
r.LastUpdate = time.Now()
snapshot := r.snapshot()
r.lock.Unlock()
@ -119,7 +119,7 @@ func (r *Registry) Set(nodes []types.Node) error {
r.lock.Lock()
r.nodes = make(map[string]types.Node)
for _, n := range nodes {
r.nodes[n.Name] = n
r.nodes[n.Hostname] = n
}
snapshot := r.snapshot()
r.lock.Unlock()

10
internal/roles/dns/dns.go
View file

@ -48,10 +48,10 @@ func parseState(state types.HostState) (string, []byte) {
var builder strings.Builder
for _, d := range state.Domains {
builder.WriteString(fmt.Sprintf("%s %s\n", state.Endpoint, d))
builder.WriteString(fmt.Sprintf("%s %s\n", state.Address, d))
}
return hostsDir + state.Name, []byte(builder.String())
return hostsDir + state.Hostname, []byte(builder.String())
}
func (r *Role) OnStartup(ctx context.Context) error {
@ -76,15 +76,15 @@ func (r *Role) OnStartup(ctx context.Context) error {
func (r *Role) syncFromRegistry() {
for _, n := range r.state.Registry.ByRole(types.HostRole) {
state, err := client.Get[types.HostState](n.Address, types.PathHostDns)
state, err := client.Get[types.HostState](n.Endpoint, types.PathHostDns)
if err != nil {
log.Warn().Str("name", n.Name).Err(err).Msg("unable to get host config")
log.Warn().Str("name", n.Hostname).Err(err).Msg("unable to get host config")
continue
}
filename, data := parseState(*state)
if err := r.updateDnsmasq(filename, data); err != nil {
log.Warn().Str("name", n.Name).Err(err).Msg("unable to update dnsmasq")
log.Warn().Str("name", n.Hostname).Err(err).Msg("unable to update dnsmasq")
continue
}
}

20
internal/roles/host/host.go
View file

@ -16,11 +16,11 @@ import (
)
type Role struct {
state *state.RuntimeState
config config.HostConfig
state *state.RuntimeState
config config.HostConfig
client *traefikClient
tasksGroup sync.WaitGroup
client *traefikClient
tasksGroup sync.WaitGroup
externalDomains []string // TODO: i don't like hardcoding external/internal logic here
internalDomains []string
@ -37,15 +37,15 @@ func New(state *state.RuntimeState, config config.HostConfig) *Role {
func (r *Role) sendUpdate(domains []string, role types.Role) {
state := types.HostState{
Domains: domains,
Name: r.state.Self.Name,
Endpoint: r.state.Self.Address,
Hostname: r.state.Self.Hostname,
Address: r.state.Self.Endpoint,
}
for _, node := range r.state.Registry.ByRole(role) {
r.tasksGroup.Go(func() {
logger := log.With().Str("name", node.Name).Logger()
logger := log.With().Str("name", node.Hostname).Logger()
logger.Debug().Msg("sending update")
if _, err := client.Post[any](node.Address, types.PathDnsCallback, state); err != nil {
if _, err := client.Post[any](node.Endpoint, types.PathDnsCallback, state); err != nil {
logger.Warn().Err(err).Msg("unable to send dns info")
} else {
logger.Debug().Msg("update sent")
@ -87,8 +87,8 @@ func (r *Role) onCallback(w http.ResponseWriter, req *http.Request) {
func (r *Role) getInternal() (types.HostState, error) {
return types.HostState{
Domains: r.internalDomains,
Endpoint: r.config.IpAddress,
Name: r.state.Self.Name,
Address: r.config.IpAddress,
Hostname: r.state.Self.Hostname,
}, nil
}

8
internal/roles/master/master.go
View file

@ -50,7 +50,7 @@ func (r *Role) OnShutdown() error {
func (r *Role) notify(path types.Path, v any) {
for _, n := range r.state.Registry.Nodes() {
addr := n.Address
addr := n.Endpoint
r.tasksGroup.Go(func() {
client.Post[any](addr, path, v)
})
@ -68,17 +68,17 @@ func (r *Role) onJoin(node types.Node) ([]types.Node, error) {
}
func (r *Role) onLeave(node types.Node) (bool, error) {
if err := r.state.Registry.RemoveNode(node.Name); err != nil {
if err := r.state.Registry.RemoveNode(node.Hostname); err != nil {
return false, err
}
r.notify(types.PathNodeLeave, node.Name)
r.notify(types.PathNodeLeave, node.Hostname)
return true, nil
}
func (r *Role) onKeepAlive(node types.Node) (bool, error) {
if ok := r.state.Registry.Exists(node.Name); !ok {
if ok := r.state.Registry.Exists(node.Hostname); !ok {
_, err := r.onJoin(node)
return true, err
}

4
internal/roles/master/observer.go
View file

@ -33,14 +33,14 @@ func newObserver(
func (o *observer) pollNodes(ctx context.Context, onLeave func(types.Node) error) {
for _, n := range o.state.Registry.Nodes() {
name := n.Name
name := n.Hostname
logger := log.With().Str("name", name).Logger()
logger.Debug().Msg("checking node")
delay := time.Duration(o.backoff)
alive := false
for i := o.backoffCount; i > 0; i-- {
_, err := client.Get[any](n.Address, types.PathNodeHealthcheck)
_, err := client.Get[any](n.Endpoint, types.PathNodeHealthcheck)
if err == nil {
logger.Debug().Msg("node is alive")

14
internal/roles/node/node.go
View file

@ -29,10 +29,10 @@ func New(state *state.RuntimeState, config config.NodeConfig) *Role {
func (r *Role) Join(bootstrap string) error {
masters := make(map[string]struct{})
for _, node := range r.state.Registry.ByRole(types.MasterRole) {
if node.Name == r.state.Self.Name {
if node.Hostname == r.state.Self.Hostname {
continue
}
masters[node.Address] = struct{}{}
masters[node.Endpoint] = struct{}{}
}
if bootstrap != "" {
masters[bootstrap] = struct{}{}
@ -69,10 +69,10 @@ func (r *Role) Leave() error {
sent := false
for _, m := range masters {
logger := log.With().Str("name", m.Name).Logger()
logger := log.With().Str("name", m.Hostname).Logger()
logger.Debug().Msg("sending leave message")
_, err := client.Post[any](m.Address, types.PathMasterLeave, r.state.Self)
_, err := client.Post[any](m.Endpoint, types.PathMasterLeave, r.state.Self)
if err != nil {
logger.Debug().Err(err).Msg("unable to send leave message")
continue
@ -114,10 +114,10 @@ func (r *Role) keepaliveFunc(ctx context.Context) func() {
sent := false
for _, m := range masters {
logger := log.With().Str("name", m.Name).Logger()
logger := log.With().Str("name", m.Hostname).Logger()
logger.Debug().Msg("sending keepalive packet")
if _, err := client.Post[any](m.Address, types.PathMasterKeepalive, r.state.Self); err != nil {
if _, err := client.Post[any](m.Endpoint, types.PathMasterKeepalive, r.state.Self); err != nil {
continue
} else {
logger.Debug().Msg("keepalive packet sent")
@ -151,7 +151,7 @@ func (r *Role) onJoin(node types.Node) (bool, error) {
}
func (r *Role) onLeave(node types.Node) (bool, error) {
if err := r.state.Registry.RemoveNode(node.Name); err != nil {
if err := r.state.Registry.RemoveNode(node.Hostname); err != nil {
return false, err
}
return true, nil

4
internal/types/host.go
View file

@ -2,6 +2,6 @@ package types
type HostState struct {
Domains []string
Endpoint string
Name string
Address string
Hostname string
}

25
internal/types/node.go
View file

@ -1,16 +1,27 @@
package types
import "fmt"
// TODO: consider moving this type back to registry
type Node struct {
Address string `json:"address"`
Name string `json:"name"`
Roles []Role `json:"roles"`
Hostname string `json:"hostname"`
Address string `json:"address"`
Port int `json:"port"`
Roles []Role `json:"roles"`
Endpoint string `json:"endpoint"`
}
func NewNode(address string, name string, roles []Role) Node {
func NewNode(
hostname string,
address string,
port int,
roles []Role,
) Node {
return Node{
Address: address,
Name: name,
Roles: roles,
Hostname: hostname,
Address: address,
Port: port,
Roles: roles,
Endpoint: fmt.Sprintf("%s:%d", address, port),
}
}

1
internal/types/rpc.go
View file

@ -1 +0,0 @@
package types

2
internal/types/web.go
View file

@ -6,6 +6,8 @@ import (
"net/http"
)
// TODO: split this up
type Path string
func (p Path) String() string {