f-84: vm: sockets QEMU retirés à la suppression d'une VM #84

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-25 12:10:32 +01:00
commit 8003d26aba
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
2 changed files with 102 additions and 0 deletions

View file

@ -1,7 +1,9 @@
package vm
import (
"errors"
"fmt"
"io/fs"
"os"
"path/filepath"
"time"
@ -57,6 +59,10 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
}
// socket absent ou QEMU déjà arrêté : cleanup direct
if err := removeQEMUSockets(cfg, name); err != nil {
return err
}
if err := netns.Call(nic.vpcName, func() error {
for _, n := range d.nics {
if err := iptables.DeleteMetadataRedirect(n.ip, nic.interfaceIP, d.metadataPort); err != nil {
@ -90,6 +96,16 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
return state.Set(db, "vm/"+name, state.Deleted)
}
func removeQEMUSockets(cfg *configuration.Config, name string) error {
for _, dir := range []string{cfg.QEMU.SerialDir, cfg.QEMU.MonitorDir, cfg.QEMU.QMPDir} {
path := filepath.Join(dir, name+".sock")
if err := os.Remove(path); err != nil && !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("remove qemu socket: %w", err)
}
}
return nil
}
func removeDHCPFiles(d vmData, name string, backend dhcpbackend.Backend) error {
for _, f := range dhcpReservations(d) {
if err := backend.DelVM(f.subnet, name, f.reservations); err != nil {

View file

@ -0,0 +1,86 @@
package vm
import (
"os"
"path/filepath"
"strings"
"testing"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
)
func socketDirs(t *testing.T) *configuration.Config {
t.Helper()
root, err := os.MkdirTemp("", "sock")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { os.RemoveAll(root) })
cfg := &configuration.Config{}
cfg.QEMU.SerialDir = filepath.Join(root, "serial")
cfg.QEMU.MonitorDir = filepath.Join(root, "monitor")
cfg.QEMU.QMPDir = filepath.Join(root, "qmp")
for _, dir := range []string{cfg.QEMU.SerialDir, cfg.QEMU.MonitorDir, cfg.QEMU.QMPDir} {
if err := os.Mkdir(dir, 0755); err != nil {
t.Fatal(err)
}
}
return cfg
}
func leave(t *testing.T, path string) {
t.Helper()
if err := os.WriteFile(path, nil, 0600); err != nil {
t.Fatal(err)
}
}
func TestRemoveQEMUSockets_RemovesTheThreeSocketsOfTheVM(t *testing.T) {
cfg := socketDirs(t)
sockets := []string{
filepath.Join(cfg.QEMU.SerialDir, "t12-err.sock"),
filepath.Join(cfg.QEMU.MonitorDir, "t12-err.sock"),
filepath.Join(cfg.QEMU.QMPDir, "t12-err.sock"),
}
for _, s := range sockets {
leave(t, s)
}
other := filepath.Join(cfg.QEMU.MonitorDir, "t12-ok.sock")
leave(t, other)
if err := removeQEMUSockets(cfg, "t12-err"); err != nil {
t.Fatal(err)
}
for _, s := range sockets {
if _, err := os.Lstat(s); !os.IsNotExist(err) {
t.Errorf("%s laissé (%v)", s, err)
}
}
if _, err := os.Lstat(other); err != nil {
t.Errorf("socket d'une autre VM retiré : %v", err)
}
}
func TestRemoveQEMUSockets_AbsentSocketsAreNotAnError(t *testing.T) {
cfg := socketDirs(t)
leave(t, filepath.Join(cfg.QEMU.MonitorDir, "t12-err.sock"))
if err := removeQEMUSockets(cfg, "t12-err"); err != nil {
t.Errorf("sockets serial et qmp absents : %v", err)
}
if err := removeQEMUSockets(cfg, "t12-err"); err != nil {
t.Errorf("second passage : %v", err)
}
}
func TestRemoveQEMUSockets_ReportsAFailedRemoval(t *testing.T) {
cfg := socketDirs(t)
blocked := filepath.Join(cfg.QEMU.QMPDir, "t12-err.sock")
if err := os.Mkdir(blocked, 0755); err != nil {
t.Fatal(err)
}
leave(t, filepath.Join(blocked, "x"))
err := removeQEMUSockets(cfg, "t12-err")
if err == nil || !strings.Contains(err.Error(), "remove qemu socket") || !strings.Contains(err.Error(), blocked) {
t.Errorf("erreur %v, attendu l'échec de suppression de %s", err, blocked)
}
}