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

@ -107,7 +107,14 @@ func (b Two) TeardownSubnet(s Subnet) error {
}
}
return statefile.Remove(b.statePath(s))
return b.removeFiles(s)
}
func (b Two) removeFiles(s Subnet) error {
if err := statefile.Remove(b.statePath(s)); err != nil {
return err
}
return statefile.Remove(dhcpapi.SocketPath(b.runDir(), s.Instance()))
}
func (b Two) SetVM(s Subnet, vmName string, res []Reservation) error {

View file

@ -252,3 +252,37 @@ func mustMAC(t *testing.T, s string) net.HardwareAddr {
}
return m
}
func TestTwoRemoveFiles_RemovesTheStateAndASocketLeftByADeadServer(t *testing.T) {
b := Two{RunDir: shortTempDir(t)}
s := testSubnet(t)
state := dhcpapi.StatePath(b.RunDir, s.Instance())
if err := os.WriteFile(state, []byte("{}"), 0o600); err != nil {
t.Fatalf("WriteFile: %v", err)
}
socket := dhcpapi.SocketPath(b.RunDir, s.Instance())
listener, err := net.Listen("unix", socket)
if err != nil {
t.Fatalf("Listen: %v", err)
}
listener.(*net.UnixListener).SetUnlinkOnClose(false)
listener.Close()
if err := b.removeFiles(s); err != nil {
t.Fatalf("removeFiles: %v", err)
}
for _, path := range []string{state, socket} {
if _, err := os.Stat(path); !os.IsNotExist(err) {
t.Errorf("%s still present (%v)", path, err)
}
}
}
func TestTwoRemoveFiles_OnAbsentFilesIsNotAnError(t *testing.T) {
b := Two{RunDir: shortTempDir(t)}
if err := b.removeFiles(testSubnet(t)); err != nil {
t.Errorf("removing absent files must be idempotent, got %v", err)
}
}