From 825fabb64aca77dfd548b553301db54f4d69339e Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 6 Apr 2026 20:15:50 +0200 Subject: [PATCH 1/2] f-15: error: add error handle Signed-off-by: GnomeZworc --- cmd/metacli/main.go | 10 +++++++--- internal/metadata/handle.go | 26 ++++++++++++++++++++------ 2 files changed, 27 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..9ec5486 100644 --- a/internal/metadata/handle.go +++ b/internal/metadata/handle.go @@ -1,26 +1,40 @@ 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) + 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 } From bf00d74a261f6353d2ed924ea38456523f68a873 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 6 Apr 2026 20:16:24 +0200 Subject: [PATCH 2/2] f-15: fix: remove lock from db in readonly Signed-off-by: GnomeZworc --- pkg/db/kv/init.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/db/kv/init.go b/pkg/db/kv/init.go index cc09cb0..677c656 100644 --- a/pkg/db/kv/init.go +++ b/pkg/db/kv/init.go @@ -6,7 +6,8 @@ import ( func InitDB(conf Config, readonly bool) *badger.DB { opts := badger.DefaultOptions(conf.Path). - WithReadOnly(readonly) + WithReadOnly(readonly). + WithBypassLockGuard(readonly) opts.Logger = nil opts.ValueLogFileSize = 10 << 20 // 10 Mo par fichier vlog opts.NumMemtables = 1