f-77: dhcp: arrêt propre sur SIGTERM, socket de contrôle retirée au teardown #77

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-19 16:06:49 +02:00
commit ecaa34d686
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
8 changed files with 178 additions and 10 deletions

View file

@ -1,11 +1,16 @@
package main
import (
"context"
"errors"
"flag"
"fmt"
"log/slog"
"net"
"os"
"os/signal"
"strings"
"syscall"
dhcpapi "git.g3e.fr/syonad/two/internal/api/dhcp"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
@ -61,12 +66,6 @@ func run() error {
}
defer control.Close()
go func() {
if err := control.Serve(); err != nil {
log.Error("control socket stopped", "error", err)
}
}()
listen := listenInterface(*iface, interfaceExists)
conn, err := server4.NewIPv4UDPConn(listen, &net.UDPAddr{Port: dhcpv4.ServerPort})
if err != nil {
@ -76,7 +75,37 @@ func run() error {
log.Info("dhcp server started", "listen", listen, "state", store.Path(), "socket", control.Addr())
return store.Serve(conn, log)
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
defer stop()
return serve(ctx, control, conn, store, log)
}
func serve(ctx context.Context, control *dhcpapi.Server, conn net.PacketConn, store *dhcpd.Store, log *slog.Logger) error {
go func() {
if err := control.Serve(); err != nil && !errors.Is(err, net.ErrClosed) {
log.Error("control socket stopped", "error", err)
}
}()
served := make(chan error, 1)
go func() { served <- store.Serve(conn, log) }()
select {
case err := <-served:
return err
case <-ctx.Done():
}
log.Info("dhcp server stopping")
if err := control.Close(); err != nil {
log.Error("close the control socket", "error", err)
}
if err := conn.Close(); err != nil {
log.Error("close the dhcp socket", "error", err)
}
<-served
return nil
}
func interfaceExists(name string) bool {

90
cmd/dhcp/serve_test.go Normal file
View file

@ -0,0 +1,90 @@
package main
import (
"context"
"errors"
"io"
"log/slog"
"net"
"os"
"path/filepath"
"testing"
"time"
dhcpapi "git.g3e.fr/syonad/two/internal/api/dhcp"
"git.g3e.fr/syonad/two/internal/dhcpd"
)
func startServe(t *testing.T, ctx context.Context) (string, net.PacketConn, <-chan error) {
t.Helper()
dir, err := os.MkdirTemp("", "dhcp")
if err != nil {
t.Fatalf("MkdirTemp : %v", err)
}
t.Cleanup(func() { os.RemoveAll(dir) })
log := slog.New(slog.NewTextHandler(io.Discard, nil))
store := dhcpd.NewStore(filepath.Join(dir, "state.json"))
if err := store.Load(); err != nil {
t.Fatalf("Load : %v", err)
}
socket := filepath.Join(dir, "ctl.sock")
control, err := dhcpapi.Listen(store, socket, log)
if err != nil {
t.Fatalf("Listen : %v", err)
}
conn, err := net.ListenPacket("udp4", "127.0.0.1:0")
if err != nil {
t.Fatalf("ListenPacket : %v", err)
}
t.Cleanup(func() {
control.Close()
conn.Close()
})
done := make(chan error, 1)
go func() { done <- serve(ctx, control, conn, store, log) }()
return socket, conn, done
}
func waitServe(t *testing.T, done <-chan error) error {
t.Helper()
select {
case err := <-done:
return err
case <-time.After(2 * time.Second):
t.Fatal("serve ne s'est pas arrêté")
return nil
}
}
func TestServe_ArretDemandeFermeLesSockets(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
socket, conn, done := startServe(t, ctx)
if _, err := os.Stat(socket); err != nil {
t.Fatalf("socket de contrôle absente au démarrage : %v", err)
}
cancel()
if err := waitServe(t, done); err != nil {
t.Errorf("arrêt demandé : %v, sortie normale attendue", err)
}
if _, err := os.Stat(socket); !errors.Is(err, os.ErrNotExist) {
t.Errorf("socket de contrôle laissée après l'arrêt (%v)", err)
}
if _, err := conn.WriteTo([]byte{0}, conn.LocalAddr()); !errors.Is(err, net.ErrClosed) {
t.Errorf("socket DHCP encore ouverte après l'arrêt (%v)", err)
}
}
func TestServe_RemonteLaPerteDeLaSocketDHCP(t *testing.T) {
_, conn, done := startServe(t, context.Background())
conn.Close()
if err := waitServe(t, done); !errors.Is(err, net.ErrClosed) {
t.Errorf("erreur = %v, net.ErrClosed attendu", err)
}
}