f-74: api: disques additionnels xvdX sur la cible SCSI de même rang, sdX refusé, migration des clés disk/sdX #74
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
9b5b4a6e62
commit
1e9f436648
7 changed files with 187 additions and 27 deletions
40
internal/migration/disk.go
Normal file
40
internal/migration/disk.go
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
package migration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
||||
var legacyDiskKey = regexp.MustCompile(`^vm/([^/]+)/disk/sd([a-z])$`)
|
||||
|
||||
func MigrateVMDisks(db *badger.DB, log *slog.Logger) error {
|
||||
entries, err := kv.ListByPrefix(db, "vm/")
|
||||
if err != nil {
|
||||
return fmt.Errorf("list vm/: %w", err)
|
||||
}
|
||||
|
||||
for key, path := range entries {
|
||||
m := legacyDiskKey.FindStringSubmatch(key)
|
||||
if m == nil {
|
||||
continue
|
||||
}
|
||||
target := strings.TrimSuffix(key, "sd"+m[2]) + "xvd" + m[2]
|
||||
if existing, ok := entries[target]; ok && existing != path {
|
||||
return fmt.Errorf("migrate %s: %s already holds %q", key, target, existing)
|
||||
}
|
||||
if err := kv.AddInDB(db, target, path); err != nil {
|
||||
return fmt.Errorf("migrate %s: %w", key, err)
|
||||
}
|
||||
if err := kv.DeleteInDB(db, key); err != nil {
|
||||
return fmt.Errorf("delete legacy %s: %w", key, err)
|
||||
}
|
||||
log.Info("vm disk migrated", "resource", "vm/"+m[1], "from", "sd"+m[2], "to", "xvd"+m[2])
|
||||
}
|
||||
return nil
|
||||
}
|
||||
80
internal/migration/disk_test.go
Normal file
80
internal/migration/disk_test.go
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
package migration
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
)
|
||||
|
||||
func TestMigrateVMDisks_RenamesSCSIDisks(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
kv.AddInDB(db, "vm/i-test1/disk/vda", "/v/root.qcow2")
|
||||
kv.AddInDB(db, "vm/i-test1/disk/sda", "/v/a.qcow2")
|
||||
kv.AddInDB(db, "vm/i-test1/disk/sdc", "/v/c.qcow2")
|
||||
kv.AddInDB(db, "vm/i-test2/disk/sdb", "/v/b.qcow2")
|
||||
|
||||
if err := MigrateVMDisks(db, quietLog()); err != nil {
|
||||
t.Fatalf("MigrateVMDisks : %v", err)
|
||||
}
|
||||
|
||||
got, err := kv.ListByPrefix(db, "vm/")
|
||||
if err != nil {
|
||||
t.Fatalf("ListByPrefix : %v", err)
|
||||
}
|
||||
want := map[string]string{
|
||||
"vm/i-test1/disk/vda": "/v/root.qcow2",
|
||||
"vm/i-test1/disk/xvda": "/v/a.qcow2",
|
||||
"vm/i-test1/disk/xvdc": "/v/c.qcow2",
|
||||
"vm/i-test2/disk/xvdb": "/v/b.qcow2",
|
||||
}
|
||||
if len(got) != len(want) {
|
||||
t.Errorf("clés après migration : %v, attendu %v", got, want)
|
||||
}
|
||||
for key, value := range want {
|
||||
if got[key] != value {
|
||||
t.Errorf("%s = %q, attendu %q", key, got[key], value)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMDisks_Idempotent(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
kv.AddInDB(db, "vm/i-test1/disk/sda", "/v/a.qcow2")
|
||||
|
||||
for i := 0; i < 2; i++ {
|
||||
if err := MigrateVMDisks(db, quietLog()); err != nil {
|
||||
t.Fatalf("passe %d : %v", i, err)
|
||||
}
|
||||
}
|
||||
if got, _ := kv.GetFromDB(db, "vm/i-test1/disk/xvda"); got != "/v/a.qcow2" {
|
||||
t.Errorf("xvda = %q après deux passes", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMDisks_LeavesOtherKeys(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
kv.AddInDB(db, "vm/i-test1/nic/0/sda", "x")
|
||||
kv.AddInDB(db, "vm/i-test1/disk/sdaa", "/v/x.qcow2")
|
||||
|
||||
if err := MigrateVMDisks(db, quietLog()); err != nil {
|
||||
t.Fatalf("MigrateVMDisks : %v", err)
|
||||
}
|
||||
for _, key := range []string{"vm/i-test1/nic/0/sda", "vm/i-test1/disk/sdaa"} {
|
||||
if _, err := kv.GetFromDB(db, key); err != nil {
|
||||
t.Errorf("%s ne devait pas être touchée : %v", key, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMDisks_RefusesConflict(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
kv.AddInDB(db, "vm/i-test1/disk/sda", "/v/a.qcow2")
|
||||
kv.AddInDB(db, "vm/i-test1/disk/xvda", "/v/other.qcow2")
|
||||
|
||||
if err := MigrateVMDisks(db, quietLog()); err == nil {
|
||||
t.Fatal("un conflit sda/xvda doit faire échouer la migration")
|
||||
}
|
||||
if got, _ := kv.GetFromDB(db, "vm/i-test1/disk/sda"); got != "/v/a.qcow2" {
|
||||
t.Errorf("sda ne doit pas être supprimée en cas de conflit : %q", got)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue