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

fix(instance): wait for volumes after server deletion #4149

Merged
merged 6 commits into from
Dec 26, 2024
Merged

fix(instance): wait for volumes after server deletion #4149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a504b2
fix(instance): wait for volumes after server deletion
Codelax Sep 27, 2024
558fc40
record instance tests
Codelax Dec 24, 2024
9acf5cc
add newline in warning message
Codelax Dec 24, 2024
3bc518c
record lb cassettes
Codelax Dec 24, 2024
e40719a
record vpc cassettes
Codelax Dec 24, 2024
853b96f
lint
Codelax Dec 24, 2024
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
4 changes: 2 additions & 2 deletions internal/namespaces/instance/v1/custom_server_create_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func (sb *ServerBuilder) ValidateVolumes() error {
return err
}
} else {
logger.Warningf("skipping root volume validation")
logger.Warningf("skipping root volume validation\n")
}

// Validate total local volume sizes.
Expand All @@ -283,7 +283,7 @@ func (sb *ServerBuilder) ValidateVolumes() error {
return err
}
} else {
logger.Warningf("skip local volume size validation")
logger.Warningf("skip local volume size validation\n")
}

// Sanitize the volume map to respect API schemas
Expand Down
59 changes: 44 additions & 15 deletions internal/namespaces/instance/v1/custom_server_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,22 +190,9 @@ func serverDeleteCommand() *core.Command {
case volume.VolumeType == instance.VolumeServerVolumeTypeScratch:
continue
}
if volume.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
err = block.NewAPI(client).DeleteVolume(&block.DeleteVolumeRequest{
Zone: deleteServerArgs.Zone,
VolumeID: volume.ID,
})
} else {
err = api.DeleteVolume(&instance.DeleteVolumeRequest{
Zone: deleteServerArgs.Zone,
VolumeID: volume.ID,
})
}
err := serverDeleteVolume(volume, api, block.NewAPI(client))
if err != nil {
return nil, &core.CliError{
Err: err,
Hint: "Make sure this resource have been deleted or try to delete it manually.",
}
return nil, err
}
humanSize, err := human.Marshal(volume.Size, nil)
if err != nil {
Expand Down Expand Up @@ -235,3 +222,45 @@ func serverDeleteCommand() *core.Command {
},
}
}

func errorDeletingResource(err error) error {
return &core.CliError{
Err: err,
Hint: "Make sure this resource have been deleted or try to delete it manually.",
}
}

func serverDeleteVolume(volume *instance.VolumeServer, instanceAPI *instance.API, blockAPI *block.API) error {
var err error

if volume.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
_, err = blockAPI.WaitForVolumeAndReferences(&block.WaitForVolumeAndReferencesRequest{
Zone: volume.Zone,
VolumeID: volume.ID,
})
if err != nil {
return errorDeletingResource(err)
}

err = blockAPI.DeleteVolume(&block.DeleteVolumeRequest{
Zone: volume.Zone,
VolumeID: volume.ID,
})
} else {
_, err = instanceAPI.WaitForVolume(&instance.WaitForVolumeRequest{
VolumeID: volume.ID,
Zone: volume.Zone,
})
if err != nil {
return errorDeletingResource(err)
}
err = instanceAPI.DeleteVolume(&instance.DeleteVolumeRequest{
Zone: volume.Zone,
VolumeID: volume.ID,
})
}
if err != nil {
return errorDeletingResource(err)
}
return nil
}
3,706 changes: 1,722 additions & 1,984 deletions ...tdata/test-create-server-errors-error-already-attached-additional-volume-id.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .../v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Cannot create the server: failed to build volume template: volume 3260c736-5a82-4d5e-b455-439a07e52317 is already attached to f8050da0-db3d-45c9-b51f-6215300b07d8 server
Cannot create the server: failed to build volume template: volume 2fa51c6d-69b2-4bdd-bef8-80f011e72f33 is already attached to 8c6642d3-5c68-4e73-aa61-f655e5fbbe9c server
🟥🟥🟥 JSON STDERR 🟥🟥🟥
{
"error": "cannot create the server: failed to build volume template: volume 3260c736-5a82-4d5e-b455-439a07e52317 is already attached to f8050da0-db3d-45c9-b51f-6215300b07d8 server"
"error": "cannot create the server: failed to build volume template: volume 2fa51c6d-69b2-4bdd-bef8-80f011e72f33 is already attached to 8c6642d3-5c68-4e73-aa61-f655e5fbbe9c server"
}
1,786 changes: 813 additions & 973 deletions ...1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,892 changes: 976 additions & 916 deletions ...amespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,806 changes: 912 additions & 894 deletions ...st-create-server-errors-error-image-size-is-incompatible-with-instance-type.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,740 changes: 790 additions & 950 deletions ...tdata/test-create-server-errors-error-invalid-additional-volume-snapshot-id.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,704 changes: 867 additions & 837 deletions ...es/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,808 changes: 883 additions & 925 deletions ...ces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,344 changes: 1,337 additions & 7 deletions .../instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,652 changes: 782 additions & 870 deletions .../namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,778 changes: 866 additions & 912 deletions ...ance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,736 changes: 788 additions & 948 deletions ...instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,724 changes: 782 additions & 942 deletions ...stance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,740 changes: 790 additions & 950 deletions ...v1/testdata/test-create-server-errors-error-invalid-root-volume-snapshot-id.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,760 changes: 815 additions & 945 deletions .../test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,760 changes: 815 additions & 945 deletions .../test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,808 changes: 839 additions & 969 deletions .../test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,760 changes: 815 additions & 945 deletions ...a/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,760 changes: 815 additions & 945 deletions ...a/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,800 changes: 835 additions & 965 deletions ...a/test-create-server-errors-error-invalid-total-local-volumes-size-too-low3.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,892 changes: 976 additions & 916 deletions ...espaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,860 changes: 948 additions & 912 deletions .../instance/v1/testdata/test-create-server-errors-errorssh-key-id-is-required.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2,288 changes: 1,171 additions & 1,117 deletions internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ip.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2,260 changes: 1,157 additions & 1,103 deletions internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ipid.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2,258 changes: 1,156 additions & 1,102 deletions ...rnal/namespaces/instance/v1/testdata/test-create-server-ips-explicit-new-ip.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,784 changes: 1,746 additions & 2,038 deletions .../namespaces/instance/v1/testdata/test-create-server-ips-run-with-dynamic-ip.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,558 changes: 1,902 additions & 1,656 deletions ...spaces/instance/v1/testdata/test-create-server-ips-with-ipv6-and-dynamic-ip.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4,080 changes: 2,267 additions & 1,813 deletions ...l/namespaces/instance/v1/testdata/test-create-server-ips-with-ipv6-and-ipv4.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,720 changes: 1,645 additions & 2,075 deletions internal/namespaces/instance/v1/testdata/test-create-server-ips-with-ipv6.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,786 changes: 1,929 additions & 1,857 deletions ...ance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions ...es/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
ID 475ad734-23b2-4f8d-b5be-6d08cc547079
Name cli-srv-dazzling-einstein
Organization ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b
Project ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b
ID fd9bd48b-914c-4bdc-9529-9ab66fffc07d
Name cli-srv-angry-nobel
Organization 105bdce1-64c0-48ab-899d-868455867ecf
Project 105bdce1-64c0-48ab-899d-868455867ecf
AllowedActions.0 poweron
AllowedActions.1 backup
CommercialType H100-1-80G
CreationDate few seconds ago
DynamicIPRequired true
RoutedIPEnabled true
EnableIPv6 false
Hostname cli-srv-dazzling-einstein
Image.ID 4fcfabcd-4ed8-4299-b48a-78118d1b8464
Hostname cli-srv-angry-nobel
Image.ID ef8a58ad-1f96-4893-bf39-9045b7e666ce
Image.Name Ubuntu Jammy GPU OS 12 passthrough
Image.Arch x86_64
Image.CreationDate few seconds ago
Expand All @@ -21,70 +21,70 @@ Image.ExtraVolumes 0
Image.FromServer -
Image.Organization 51b656e3-4865-41e8-adbc-0c45bdd780db
Image.Public true
Image.RootVolume fe7051b2-0f40-40e1-83f9-cb11a3e6fd4c
Image.RootVolume 5fda0ed0-c972-4cb9-b3fe-d8c76610aa9a
Image.State available
Image.Project 51b656e3-4865-41e8-adbc-0c45bdd780db
Image.Zone fr-par-2
Protected false
PublicIP.ID a31632e4-d8f5-409d-a4ff-fca3ae1b00d2
PublicIP.Address 51.159.154.54
PublicIP.ID 633b844e-0ee5-45c4-a6ee-57415762ee3f
PublicIP.Address 51.159.173.252
PublicIP.Gateway 62.210.0.1
PublicIP.Netmask 32
PublicIP.Family inet
PublicIP.Dynamic false
PublicIP.ProvisioningMode dhcp
PublicIP.IpamID c12ae760-ac1b-489c-b425-eb045629acf0
PublicIP.IpamID 90c213b6-270e-40e9-986a-d478f83a2006
PublicIP.State attached
PublicIPs.0.ID a31632e4-d8f5-409d-a4ff-fca3ae1b00d2
PublicIPs.0.Address 51.159.154.54
PublicIPs.0.ID 633b844e-0ee5-45c4-a6ee-57415762ee3f
PublicIPs.0.Address 51.159.173.252
PublicIPs.0.Gateway 62.210.0.1
PublicIPs.0.Netmask 32
PublicIPs.0.Family inet
PublicIPs.0.Dynamic false
PublicIPs.0.ProvisioningMode dhcp
PublicIPs.0.IpamID c12ae760-ac1b-489c-b425-eb045629acf0
PublicIPs.0.IpamID 90c213b6-270e-40e9-986a-d478f83a2006
PublicIPs.0.State attached
MacAddress de:00:00:40:b0:af
MacAddress de:00:00:63:4f:a3
ModificationDate few seconds ago
State archived
BootType local
Volumes.0.ID 08424d6f-cf09-4498-94b5-042ef6eb38f1
Volumes.0.ID 5dbd1232-3774-4290-94d4-aaa381ba997e
Volumes.0.Name Ubuntu Jammy GPU OS 12 passthrough
Volumes.0.Organization ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b
Volumes.0.Server.ID 475ad734-23b2-4f8d-b5be-6d08cc547079
Volumes.0.Server.Name cli-srv-dazzling-einstein
Volumes.0.Organization 105bdce1-64c0-48ab-899d-868455867ecf
Volumes.0.Server.ID fd9bd48b-914c-4bdc-9529-9ab66fffc07d
Volumes.0.Server.Name cli-srv-angry-nobel
Volumes.0.Size 20 GB
Volumes.0.VolumeType b_ssd
Volumes.0.CreationDate few seconds ago
Volumes.0.ModificationDate few seconds ago
Volumes.0.State available
Volumes.0.Project ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b
Volumes.0.Project 105bdce1-64c0-48ab-899d-868455867ecf
Volumes.0.Boot false
Volumes.0.Zone fr-par-2
Volumes.1.ID 318bd18f-ef0c-4595-825b-097757fdf331
Volumes.1.Name default-cli-scratch-volume
Volumes.1.Organization ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b
Volumes.1.Server.ID 475ad734-23b2-4f8d-b5be-6d08cc547079
Volumes.1.Server.Name cli-srv-dazzling-einstein
Volumes.1.ID 9556fd24-b6cd-4c50-a82e-1888a0169988
Volumes.1.Name cli-srv-angry-nobel-1
Volumes.1.Organization 105bdce1-64c0-48ab-899d-868455867ecf
Volumes.1.Server.ID fd9bd48b-914c-4bdc-9529-9ab66fffc07d
Volumes.1.Server.Name cli-srv-angry-nobel
Volumes.1.Size 3.0 TB
Volumes.1.VolumeType scratch
Volumes.1.CreationDate few seconds ago
Volumes.1.ModificationDate few seconds ago
Volumes.1.State available
Volumes.1.Project ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b
Volumes.1.Project 105bdce1-64c0-48ab-899d-868455867ecf
Volumes.1.Boot false
Volumes.1.Zone fr-par-2
SecurityGroup.ID 07a1e012-3e68-44ec-9b41-cbe87504b716
SecurityGroup.ID eaabb9f4-fbdf-4310-9cb6-4d42934b673a
SecurityGroup.Name Default security group
StateDetail -
Arch x86_64
Zone fr-par-2
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
{
"id": "475ad734-23b2-4f8d-b5be-6d08cc547079",
"name": "cli-srv-dazzling-einstein",
"organization": "ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b",
"project": "ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b",
"id": "fd9bd48b-914c-4bdc-9529-9ab66fffc07d",
"name": "cli-srv-angry-nobel",
"organization": "105bdce1-64c0-48ab-899d-868455867ecf",
"project": "105bdce1-64c0-48ab-899d-868455867ecf",
"allowed_actions": [
"poweron",
"backup"
Expand All @@ -95,9 +95,9 @@ Zone fr-par-2
"dynamic_ip_required": true,
"routed_ip_enabled": true,
"enable_ipv6": false,
"hostname": "cli-srv-dazzling-einstein",
"hostname": "cli-srv-angry-nobel",
"image": {
"id": "4fcfabcd-4ed8-4299-b48a-78118d1b8464",
"id": "ef8a58ad-1f96-4893-bf39-9045b7e666ce",
"name": "Ubuntu Jammy GPU OS 12 passthrough",
"arch": "x86_64",
"creation_date": "1970-01-01T00:00:00.0Z",
Expand All @@ -108,7 +108,7 @@ Zone fr-par-2
"organization": "51b656e3-4865-41e8-adbc-0c45bdd780db",
"public": true,
"root_volume": {
"id": "fe7051b2-0f40-40e1-83f9-cb11a3e6fd4c",
"id": "5fda0ed0-c972-4cb9-b3fe-d8c76610aa9a",
"name": "Ubuntu Jammy GPU OS 12 passthrough",
"size": 20000000000,
"volume_type": "unified"
Expand All @@ -121,77 +121,77 @@ Zone fr-par-2
"protected": false,
"private_ip": null,
"public_ip": {
"id": "a31632e4-d8f5-409d-a4ff-fca3ae1b00d2",
"address": "51.159.154.54",
"id": "633b844e-0ee5-45c4-a6ee-57415762ee3f",
"address": "51.159.173.252",
"gateway": "62.210.0.1",
"netmask": "32",
"family": "inet",
"dynamic": false,
"provisioning_mode": "dhcp",
"tags": [],
"ipam_id": "c12ae760-ac1b-489c-b425-eb045629acf0",
"ipam_id": "90c213b6-270e-40e9-986a-d478f83a2006",
"state": "attached"
},
"public_ips": [
{
"id": "a31632e4-d8f5-409d-a4ff-fca3ae1b00d2",
"address": "51.159.154.54",
"id": "633b844e-0ee5-45c4-a6ee-57415762ee3f",
"address": "51.159.173.252",
"gateway": "62.210.0.1",
"netmask": "32",
"family": "inet",
"dynamic": false,
"provisioning_mode": "dhcp",
"tags": [],
"ipam_id": "c12ae760-ac1b-489c-b425-eb045629acf0",
"ipam_id": "90c213b6-270e-40e9-986a-d478f83a2006",
"state": "attached"
}
],
"mac_address": "de:00:00:40:b0:af",
"mac_address": "de:00:00:63:4f:a3",
"modification_date": "1970-01-01T00:00:00.0Z",
"state": "stopped",
"location": null,
"ipv6": null,
"boot_type": "local",
"volumes": {
"0": {
"id": "08424d6f-cf09-4498-94b5-042ef6eb38f1",
"id": "5dbd1232-3774-4290-94d4-aaa381ba997e",
"name": "Ubuntu Jammy GPU OS 12 passthrough",
"export_uri": null,
"organization": "ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b",
"organization": "105bdce1-64c0-48ab-899d-868455867ecf",
"server": {
"id": "475ad734-23b2-4f8d-b5be-6d08cc547079",
"name": "cli-srv-dazzling-einstein"
"id": "fd9bd48b-914c-4bdc-9529-9ab66fffc07d",
"name": "cli-srv-angry-nobel"
},
"size": 20000000000,
"volume_type": "b_ssd",
"creation_date": "1970-01-01T00:00:00.0Z",
"modification_date": "1970-01-01T00:00:00.0Z",
"state": "available",
"project": "ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b",
"project": "105bdce1-64c0-48ab-899d-868455867ecf",
"boot": false,
"zone": "fr-par-2"
},
"1": {
"id": "318bd18f-ef0c-4595-825b-097757fdf331",
"name": "default-cli-scratch-volume",
"id": "9556fd24-b6cd-4c50-a82e-1888a0169988",
"name": "cli-srv-angry-nobel-1",
"export_uri": null,
"organization": "ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b",
"organization": "105bdce1-64c0-48ab-899d-868455867ecf",
"server": {
"id": "475ad734-23b2-4f8d-b5be-6d08cc547079",
"name": "cli-srv-dazzling-einstein"
"id": "fd9bd48b-914c-4bdc-9529-9ab66fffc07d",
"name": "cli-srv-angry-nobel"
},
"size": 3000000000000,
"volume_type": "scratch",
"creation_date": "1970-01-01T00:00:00.0Z",
"modification_date": "1970-01-01T00:00:00.0Z",
"state": "available",
"project": "ee7bd9e1-9cbd-4724-b2f4-19e50f3cf38b",
"project": "105bdce1-64c0-48ab-899d-868455867ecf",
"boot": false,
"zone": "fr-par-2"
}
},
"security_group": {
"id": "07a1e012-3e68-44ec-9b41-cbe87504b716",
"id": "eaabb9f4-fbdf-4310-9cb6-4d42934b673a",
"name": "Default security group"
},
"maintenances": [],
Expand Down
Loading
Loading