mirror of
https://github.com/psviderski/uncloud.git
synced 2026-10-06 13:18:58 +00:00
BREAKING CHANGE: move Uncloud API socket to /run/uncloud/api/uncloud.sock, activate it by systemd socket unit
This commit is contained in:
1 parent
c65f352250
commit
f68c9859d9
24 files changed
+345
-112
No files matched your search
@@ -2,24 +2,50 @@ package daemon
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net"
|
||||
|
||||
"github.com/coreos/go-systemd/activation"
|
||||
systemd "github.com/coreos/go-systemd/daemon"
|
||||
"github.com/psviderski/uncloud/internal/machine"
|
||||
)
|
||||
|
||||
const systemdSocketUnit = "uncloud.socket"
|
||||
|
||||
type Daemon struct {
|
||||
machine *machine.Machine
|
||||
}
|
||||
|
||||
func New(dataDir string) (*Daemon, error) {
|
||||
listeners, err := activation.ListenersWithNames()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("get systemd-activated sockets: %w", err)
|
||||
}
|
||||
|
||||
listener, err := selectActivatedListener(listeners)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if listener != nil {
|
||||
slog.Info("Using systemd-activated API socket.", "addr", listener.Addr().String())
|
||||
}
|
||||
|
||||
config := &machine.Config{
|
||||
DataDir: dataDir,
|
||||
DataDir: dataDir,
|
||||
ClusterAPISockPath: machine.DefaultClusterAPISockPath,
|
||||
ClusterAPIListener: listener,
|
||||
}
|
||||
mach, err := machine.NewMachine(config)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("init machine: %w", err)
|
||||
initErr := fmt.Errorf("init machine: %w", err)
|
||||
if listener != nil {
|
||||
if closeErr := listener.Close(); closeErr != nil {
|
||||
initErr = errors.Join(initErr, fmt.Errorf("close systemd-activated socket: %w", closeErr))
|
||||
}
|
||||
}
|
||||
return nil, initErr
|
||||
}
|
||||
|
||||
return &Daemon{
|
||||
@@ -27,6 +53,40 @@ func New(dataDir string) (*Daemon, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
// selectActivatedListener returns the systemd activated listener. If systemd supplied multiple listeners,
|
||||
// it returns the one associated with systemdSocketUnit.
|
||||
func selectActivatedListener(listeners map[string][]net.Listener) (net.Listener, error) {
|
||||
var activated []net.Listener
|
||||
for _, named := range listeners {
|
||||
activated = append(activated, named...)
|
||||
}
|
||||
|
||||
if len(activated) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
if len(activated) == 1 {
|
||||
return activated[0], nil
|
||||
}
|
||||
|
||||
named, ok := listeners[systemdSocketUnit]
|
||||
if !ok || len(named) != 1 {
|
||||
return nil, fmt.Errorf("expected one systemd-activated socket named '%s', received %d",
|
||||
systemdSocketUnit, len(named))
|
||||
}
|
||||
|
||||
// Close all other unused listeners.
|
||||
for name, unused := range listeners {
|
||||
if name == systemdSocketUnit {
|
||||
continue
|
||||
}
|
||||
for _, l := range unused {
|
||||
_ = l.Close()
|
||||
}
|
||||
}
|
||||
|
||||
return named[0], nil
|
||||
}
|
||||
|
||||
func (d *Daemon) Run(ctx context.Context) error {
|
||||
slog.Info("Starting machine.")
|
||||
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package daemon
|
||||
|
||||
import (
|
||||
"net"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestSelectActivatedListener(t *testing.T) {
|
||||
t.Run("no activated listeners", func(t *testing.T) {
|
||||
listener, err := selectActivatedListener(nil)
|
||||
require.NoError(t, err)
|
||||
assert.Nil(t, listener)
|
||||
})
|
||||
|
||||
t.Run("only listener regardless of name", func(t *testing.T) {
|
||||
activated := testListener(t)
|
||||
|
||||
listener, err := selectActivatedListener(map[string][]net.Listener{"another.socket": {activated}})
|
||||
require.NoError(t, err)
|
||||
assert.Same(t, activated, listener)
|
||||
})
|
||||
|
||||
t.Run("named listener when multiple", func(t *testing.T) {
|
||||
activated := testListener(t)
|
||||
extra := testListener(t)
|
||||
|
||||
listener, err := selectActivatedListener(map[string][]net.Listener{
|
||||
systemdSocketUnit: {activated},
|
||||
"another.socket": {extra},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Same(t, activated, listener)
|
||||
assert.Error(t, extra.Close())
|
||||
})
|
||||
|
||||
t.Run("multiple listeners without expected name", func(t *testing.T) {
|
||||
first := testListener(t)
|
||||
second := testListener(t)
|
||||
|
||||
listener, err := selectActivatedListener(map[string][]net.Listener{
|
||||
"first.socket": {first},
|
||||
"second.socket": {second},
|
||||
})
|
||||
require.ErrorContains(t, err, "expected one systemd-activated socket")
|
||||
assert.Nil(t, listener)
|
||||
})
|
||||
|
||||
t.Run("multiple listeners under expected name", func(t *testing.T) {
|
||||
first := testListener(t)
|
||||
second := testListener(t)
|
||||
|
||||
listener, err := selectActivatedListener(map[string][]net.Listener{
|
||||
systemdSocketUnit: {first, second},
|
||||
})
|
||||
require.ErrorContains(t, err, "expected one systemd-activated socket")
|
||||
assert.Nil(t, listener)
|
||||
})
|
||||
}
|
||||
|
||||
func testListener(t *testing.T) net.Listener {
|
||||
t.Helper()
|
||||
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { _ = listener.Close() })
|
||||
|
||||
return listener
|
||||
}
|
||||
Reference in new issue
Block a user