From 6c6861a72af96579d3affe3d153f55f7f6bf00d7 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Mon, 30 Sep 2024 13:03:49 +0100 Subject: [PATCH 1/2] lxd/instance/drivers/driver/lxc: Use correct container name in Update call to liblxc Signed-off-by: Thomas Parrott --- lxd/instance/drivers/driver_lxc.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go index 25d19770c9e2..cd86fe3dae9c 100644 --- a/lxd/instance/drivers/driver_lxc.go +++ b/lxd/instance/drivers/driver_lxc.go @@ -4358,7 +4358,8 @@ func (d *lxc) Update(args db.InstanceArgs, userRequested bool) error { // If raw.lxc changed, re-validate the config. if shared.ValueInSlice("raw.lxc", changedConfig) && d.expandedConfig["raw.lxc"] != "" { // Get a new liblxc instance. - cc, err := liblxc.NewContainer(d.name, d.state.OS.LxcPath) + cname := project.Instance(d.Project().Name, d.Name()) + cc, err := liblxc.NewContainer(cname, d.state.OS.LxcPath) if err != nil { return err } From 8128320c310cf61670ef94c2f76c9527749d47b3 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Mon, 30 Sep 2024 13:04:34 +0100 Subject: [PATCH 2/2] lxd/patches: Use lower case "project" in logging for consistency Signed-off-by: Thomas Parrott --- lxd/patches.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lxd/patches.go b/lxd/patches.go index 9190e7d63cce..b99d93d511d4 100644 --- a/lxd/patches.go +++ b/lxd/patches.go @@ -493,10 +493,10 @@ func patchVMRenameUUIDKey(name string, d *Daemon) error { newUUIDKey: uuid, } - logger.Debugf("Renaming config key %q to %q for VM %q (Project %q)", oldUUIDKey, newUUIDKey, inst.Name, inst.Project) + logger.Debugf("Renaming config key %q to %q for VM %q (project %q)", oldUUIDKey, newUUIDKey, inst.Name, inst.Project) err := tx.UpdateInstanceConfig(inst.ID, changes) if err != nil { - return fmt.Errorf("Failed renaming config key %q to %q for VM %q (Project %q): %w", oldUUIDKey, newUUIDKey, inst.Name, inst.Project, err) + return fmt.Errorf("Failed renaming config key %q to %q for VM %q (project %q): %w", oldUUIDKey, newUUIDKey, inst.Name, inst.Project, err) } } @@ -518,10 +518,10 @@ func patchVMRenameUUIDKey(name string, d *Daemon) error { newUUIDKey: uuid, } - logger.Debugf("Renaming config key %q to %q for VM %q (Project %q)", oldUUIDKey, newUUIDKey, snap.Name, snap.Project) + logger.Debugf("Renaming config key %q to %q for VM %q (project %q)", oldUUIDKey, newUUIDKey, snap.Name, snap.Project) err = tx.UpdateInstanceSnapshotConfig(snap.ID, changes) if err != nil { - return fmt.Errorf("Failed renaming config key %q to %q for VM %q (Project %q): %w", oldUUIDKey, newUUIDKey, snap.Name, snap.Project, err) + return fmt.Errorf("Failed renaming config key %q to %q for VM %q (project %q): %w", oldUUIDKey, newUUIDKey, snap.Name, snap.Project, err) } } } @@ -1394,14 +1394,14 @@ func patchInstanceRemoveVolatileLastStateIPAddresses(_ string, d *Daemon) error l.Debug("Removing config key from instance", logger.Ctx{"key": k}) err := tx.UpdateInstanceConfig(dbInst.ID, changes) if err != nil { - return fmt.Errorf("Failed removing config key %q for instance %q (Project %q): %w", k, dbInst.Name, dbInst.Project, err) + return fmt.Errorf("Failed removing config key %q for instance %q (project %q): %w", k, dbInst.Name, dbInst.Project, err) } } // Get snapshots for instance so we can check those too. dbSnaps, err := tx.GetInstanceSnapshotsWithName(ctx, dbInst.Project, dbInst.Name) if err != nil { - return fmt.Errorf("Failed getting snapshots for %q (Project %q): %w", dbInst.Name, dbInst.Project, err) + return fmt.Errorf("Failed getting snapshots for %q (project %q): %w", dbInst.Name, dbInst.Project, err) } for _, dbSnap := range dbSnaps { @@ -1423,7 +1423,7 @@ func patchInstanceRemoveVolatileLastStateIPAddresses(_ string, d *Daemon) error l.Debug("Removing config key from instance snapshot", logger.Ctx{"snapshot": dbSnap.Name, "key": k}) err := tx.UpdateInstanceSnapshotConfig(dbSnap.ID, changes) if err != nil { - return fmt.Errorf("Failed removing config key %q for instance %q (Project %q): %w", k, dbSnap.Name, dbSnap.Project, err) + return fmt.Errorf("Failed removing config key %q for instance %q (project %q): %w", k, dbSnap.Name, dbSnap.Project, err) } } }