diff --git a/cmd/metacli/main.go b/cmd/metacli/main.go index 140bde6..20706d2 100644 --- a/cmd/metacli/main.go +++ b/cmd/metacli/main.go @@ -35,19 +35,15 @@ func main() { defer db.Close() if *start { - if err := metadata.StartMetadata(metadata.NoCloudConfig{ + metadata.StartMetadata(metadata.NoCloudConfig{ VpcName: *vpc, Name: *vm_name, BindIP: *bind_ip, BindPort: *bind_port, Password: *password, SSHKEY: *ssh_key, - }, db, *dryrun); err != nil { - fmt.Println(err) - } + }, db, *dryrun) } else if *stop { - if err := metadata.StopMetadata(*vm_name, db, *dryrun); err != nil { - fmt.Println(err) - } + metadata.StopMetadata(*vm_name, db, *dryrun) } } diff --git a/internal/metadata/handle.go b/internal/metadata/handle.go index 9ec5486..33ac088 100644 --- a/internal/metadata/handle.go +++ b/internal/metadata/handle.go @@ -1,40 +1,26 @@ package metadata import ( - "fmt" - "git.g3e.fr/syonad/two/pkg/systemd" "github.com/dgraph-io/badger/v4" ) -func StartMetadata(config NoCloudConfig, db *badger.DB, dryrun bool) error { - service, err := systemd.New() - if err != nil { - return fmt.Errorf("failed to connect to systemd: %w", err) - } +func StartMetadata(config NoCloudConfig, db *badger.DB, dryrun bool) { + service, _ := systemd.New() defer service.Close() LoadNcCloudInDB(config, db) if !dryrun { - if err := service.Start("metadata@" + config.Name + ".service"); err != nil { - return fmt.Errorf("failed to start metadata@%s: %w", config.Name, err) - } + service.Start("metadata@" + config.Name) } - return nil } -func StopMetadata(vm_name string, db *badger.DB, dryrun bool) error { - service, err := systemd.New() - if err != nil { - return fmt.Errorf("failed to connect to systemd: %w", err) - } +func StopMetadata(vm_name string, db *badger.DB, dryrun bool) { + service, _ := systemd.New() defer service.Close() UnLoadNoCloudInDB(vm_name, db) if !dryrun { - if err := service.Stop("metadata@" + vm_name + ".service"); err != nil { - return fmt.Errorf("failed to stop metadata@%s: %w", vm_name, err) - } + service.Stop("metadata@" + vm_name) } - return nil } diff --git a/internal/netns/call_other.go b/internal/netns/call_other.go index 1b5794e..14a8924 100644 --- a/internal/netns/call_other.go +++ b/internal/netns/call_other.go @@ -2,6 +2,6 @@ package netns -func call(_ string, fn func() error) error { +func call(name string, fn func() error) error { return fn() } diff --git a/internal/netns/create_linux.go b/internal/netns/create_linux.go index 51c739a..8ee0afa 100644 --- a/internal/netns/create_linux.go +++ b/internal/netns/create_linux.go @@ -3,17 +3,12 @@ package netns import ( - "fmt" "os" - "runtime" "golang.org/x/sys/unix" ) func create(name string) error { - runtime.LockOSThread() - defer runtime.UnlockOSThread() - base := "/var/run/netns" path := base + "/" + name @@ -21,12 +16,6 @@ func create(name string) error { return err } - // si le fichier existe déjà, le démonter d'abord - if _, err := os.Stat(path); err == nil { - unix.Unmount(path, unix.MNT_DETACH) - os.Remove(path) - } - // fichier cible f, err := os.Create(path) if err != nil { @@ -46,12 +35,9 @@ func create(name string) error { return err } - // bind mount du netns du thread courant vers /var/run/netns/ - // /proc/self/ns/net pointe vers le ns du processus (thread principal), - // pas du thread courant — il faut utiliser le tid explicitement - threadNsPath := fmt.Sprintf("/proc/self/task/%d/ns/net", unix.Gettid()) + // bind mount du netns courant vers /var/run/netns/ if err := unix.Mount( - threadNsPath, + "/proc/self/ns/net", path, "", unix.MS_BIND, diff --git a/internal/vpc/create.go b/internal/vpc/create.go index a6e6aaa..3c3ad87 100644 --- a/internal/vpc/create.go +++ b/internal/vpc/create.go @@ -22,7 +22,7 @@ func CreateVPC(db *badger.DB, name string) error { } // create veth public for this netns - if err := netif.CreateVethToNetns("vp-"+name+"-e", "vp-public-i", "/var/run/netns/"+name, 9000); err != nil { + if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil { return err } @@ -34,24 +34,24 @@ func CreateVPC(db *badger.DB, name string) error { } // set veth to ext public bridge - if err := netif.BridgeSetMaster("vp-"+name+"-e", "br-public"); err != nil { + if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil { return err } // set veth to int public bridge if err := netns.Call(name, func() error { - return netif.BridgeSetMaster("vp-public-i", "br-public") + return netif.BridgeSetMaster("vethpublicint", "br-public") }); err != nil { return err } // set set ext veth up - if err := netif.LinkSetUp("vp-" + name + "-e"); err != nil { - return err + if err := netif.LinkSetUp("veth" + name + "ext"); err != nil { + return nil } // set set int veth up if err := netns.Call(name, func() error { - return netif.LinkSetUp("vp-public-i") + return netif.LinkSetUp("vethpublicint") }); err != nil { return err } diff --git a/internal/vpc/delete.go b/internal/vpc/delete.go index 10c863d..a05e807 100644 --- a/internal/vpc/delete.go +++ b/internal/vpc/delete.go @@ -12,7 +12,7 @@ func DeleteVPC(db *badger.DB, name string) error { if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil { return err } else if state == "deleting" { - if err := netif.DeleteLink("vp-" + name + "-e"); err != nil { + if err := netif.DeleteLink(name + "-ext"); err != nil { return err } diff --git a/pkg/db/kv/init.go b/pkg/db/kv/init.go index 677c656..cc09cb0 100644 --- a/pkg/db/kv/init.go +++ b/pkg/db/kv/init.go @@ -6,8 +6,7 @@ import ( func InitDB(conf Config, readonly bool) *badger.DB { opts := badger.DefaultOptions(conf.Path). - WithReadOnly(readonly). - WithBypassLockGuard(readonly) + WithReadOnly(readonly) opts.Logger = nil opts.ValueLogFileSize = 10 << 20 // 10 Mo par fichier vlog opts.NumMemtables = 1 diff --git a/pkg/systemd/main.go b/pkg/systemd/main.go index e89af6e..ea5fef0 100644 --- a/pkg/systemd/main.go +++ b/pkg/systemd/main.go @@ -11,7 +11,6 @@ import ( const ( defaultTimeout = 5 * time.Second - jobTimeout = 30 * time.Second jobMode = "replace" ) @@ -29,7 +28,10 @@ type ServiceStatus struct { // New crée une connexion D-Bus systemd (scope système) func New() (*Manager, error) { - conn, err := dbus.NewSystemConnectionContext(context.Background()) + ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout) + defer cancel() + + conn, err := dbus.NewSystemConnectionContext(ctx) if err != nil { return nil, err } @@ -55,17 +57,17 @@ func (m *Manager) Stop(service string) error { } func (m *Manager) job(method, service string) error { - callCtx, callCancel := context.WithTimeout(context.Background(), defaultTimeout) - defer callCancel() + ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout) + defer cancel() ch := make(chan string, 1) var err error switch method { case "StartUnit": - _, err = m.conn.StartUnitContext(callCtx, service, jobMode, ch) + _, err = m.conn.StartUnitContext(ctx, service, jobMode, ch) case "StopUnit": - _, err = m.conn.StopUnitContext(callCtx, service, jobMode, ch) + _, err = m.conn.StopUnitContext(ctx, service, jobMode, ch) default: return errors.New("unsupported job method") } @@ -74,16 +76,9 @@ func (m *Manager) job(method, service string) error { return err } - waitCtx, waitCancel := context.WithTimeout(context.Background(), jobTimeout) - defer waitCancel() - - select { - case result := <-ch: - if result != "done" { - return fmt.Errorf("%s %s failed: %s", method, service, result) - } - case <-waitCtx.Done(): - return fmt.Errorf("%s %s timed out after %s", method, service, jobTimeout) + result := <-ch + if result != "done" { + return fmt.Errorf("%s %s failed: %s", method, service, result) } return nil