Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lxd/instance/drivers: update instance config if rebuild as empty #12138

Merged
merged 2 commits into from
Aug 15, 2023
Merged

lxd/instance/drivers: update instance config if rebuild as empty #12138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7692fec
lxd/instance/drivers: update instance config if rebuild as empty
gabrielmougard Aug 10, 2023
d2ab995
test: Check that a container rebuilt as empty does not contain image …
gabrielmougard Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions lxd/instance/drivers/driver_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,12 +631,15 @@ func (d *common) rebuildCommon(inst instance.Instance, img *api.Image, op *opera

// Rebuild as empty if there is no image provided.
if img == nil {
return pool.CreateInstance(inst, nil)
}

err = pool.CreateInstanceFromImage(inst, img.Fingerprint, op)
if err != nil {
return err
err = pool.CreateInstance(inst, nil)
if err != nil {
return err
}
} else {
err = pool.CreateInstanceFromImage(inst, img.Fingerprint, op)
if err != nil {
return err
}
}

err = d.state.DB.Cluster.Transaction(context.TODO(), func(ctx context.Context, tx *db.ClusterTx) error {
Expand All @@ -645,9 +648,11 @@ func (d *common) rebuildCommon(inst instance.Instance, img *api.Image, op *opera
return err
}

err = tx.UpdateImageLastUseDate(ctx, inst.Project().Name, img.Fingerprint, time.Now().UTC())
if err != nil {
return err
if img != nil {
err = tx.UpdateImageLastUseDate(ctx, inst.Project().Name, img.Fingerprint, time.Now().UTC())
if err != nil {
return err
}
}

return nil
Expand Down
1 change: 1 addition & 0 deletions test/suites/basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ test_basic_usage() {
# Test rebuilding an instance with an empty file system.
lxc init testimage c1
lxc rebuild c1 --empty
! lxc config show c1 | grep -q 'image.*' || false
lxc delete c1 -f

# Test assigning an empty profile (with no root disk device) to an instance.
Expand Down