From 40b29657ae1f1638a15fdefd3e09eafc33f9182d Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 6 Apr 2026 18:24:23 +0200 Subject: [PATCH 1/2] f-15: fix: error in manage systemd Signed-off-by: GnomeZworc --- pkg/systemd/main.go | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkg/systemd/main.go b/pkg/systemd/main.go index ea5fef0..e89af6e 100644 --- a/pkg/systemd/main.go +++ b/pkg/systemd/main.go @@ -11,6 +11,7 @@ import ( const ( defaultTimeout = 5 * time.Second + jobTimeout = 30 * time.Second jobMode = "replace" ) @@ -28,10 +29,7 @@ type ServiceStatus struct { // New crée une connexion D-Bus systemd (scope système) func New() (*Manager, error) { - ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout) - defer cancel() - - conn, err := dbus.NewSystemConnectionContext(ctx) + conn, err := dbus.NewSystemConnectionContext(context.Background()) if err != nil { return nil, err } @@ -57,17 +55,17 @@ func (m *Manager) Stop(service string) error { } func (m *Manager) job(method, service string) error { - ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout) - defer cancel() + callCtx, callCancel := context.WithTimeout(context.Background(), defaultTimeout) + defer callCancel() ch := make(chan string, 1) var err error switch method { case "StartUnit": - _, err = m.conn.StartUnitContext(ctx, service, jobMode, ch) + _, err = m.conn.StartUnitContext(callCtx, service, jobMode, ch) case "StopUnit": - _, err = m.conn.StopUnitContext(ctx, service, jobMode, ch) + _, err = m.conn.StopUnitContext(callCtx, service, jobMode, ch) default: return errors.New("unsupported job method") } @@ -76,9 +74,16 @@ func (m *Manager) job(method, service string) error { return err } - result := <-ch - if result != "done" { - return fmt.Errorf("%s %s failed: %s", method, service, result) + 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) } return nil From 827e4398d7297d74ecebc775170f1dbf182bdce0 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 6 Apr 2026 20:15:50 +0200 Subject: [PATCH 2/2] f-15: error: add error handle Signed-off-by: GnomeZworc --- cmd/metacli/main.go | 10 +++++++--- internal/metadata/handle.go | 27 +++++++++++++++++++++------ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/cmd/metacli/main.go b/cmd/metacli/main.go index 20706d2..140bde6 100644 --- a/cmd/metacli/main.go +++ b/cmd/metacli/main.go @@ -35,15 +35,19 @@ func main() { defer db.Close() if *start { - metadata.StartMetadata(metadata.NoCloudConfig{ + if err := metadata.StartMetadata(metadata.NoCloudConfig{ VpcName: *vpc, Name: *vm_name, BindIP: *bind_ip, BindPort: *bind_port, Password: *password, SSHKEY: *ssh_key, - }, db, *dryrun) + }, db, *dryrun); err != nil { + fmt.Println(err) + } } else if *stop { - metadata.StopMetadata(*vm_name, db, *dryrun) + if err := metadata.StopMetadata(*vm_name, db, *dryrun); err != nil { + fmt.Println(err) + } } } diff --git a/internal/metadata/handle.go b/internal/metadata/handle.go index 33ac088..6347d90 100644 --- a/internal/metadata/handle.go +++ b/internal/metadata/handle.go @@ -1,26 +1,41 @@ 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) { - service, _ := systemd.New() +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) + } defer service.Close() LoadNcCloudInDB(config, db) if !dryrun { - service.Start("metadata@" + config.Name) + fmt.Println("try to start metadata server") + if err := service.Start("metadata@" + config.Name + ".service"); err != nil { + return fmt.Errorf("failed to start metadata@%s: %w", config.Name, err) + } } + return nil } -func StopMetadata(vm_name string, db *badger.DB, dryrun bool) { - service, _ := systemd.New() +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) + } defer service.Close() UnLoadNoCloudInDB(vm_name, db) if !dryrun { - service.Stop("metadata@" + vm_name) + if err := service.Stop("metadata@" + vm_name + ".service"); err != nil { + return fmt.Errorf("failed to stop metadata@%s: %w", vm_name, err) + } } + return nil }