Skip to content

fix(instance): server delete with scratch storage #3366

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

Merged
merged 1 commit into from
Sep 18, 2023
Merged

fix(instance): server delete with scratch storage #3366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions internal/namespaces/instance/v1/custom_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,8 @@ func serverDeleteCommand() *core.Command {
continue
case deleteServerArgs.WithVolumes == withVolumesBlock && volume.VolumeType != instance.VolumeServerVolumeTypeBSSD:
continue
case volume.VolumeType == instance.VolumeServerVolumeTypeScratch:
continue
}
err = api.DeleteVolume(&instance.DeleteVolumeRequest{
Zone: deleteServerArgs.Zone,
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/instance/v1/custom_server_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ func Test_CreateServerErrors(t *testing.T) {
func Test_CreateServerScratchStorage(t *testing.T) {
t.Run("Default scratch storage", core.Test(&core.TestConfig{
Commands: GetCommands(),
Cmd: "scw instance server create type=H100-1-80G image=ubuntu_jammy_gpu_os_12",
Cmd: "scw instance server create type=H100-1-80G image=ubuntu_jammy_gpu_os_12 zone=fr-par-2",
Check: core.TestCheckCombine(
core.TestCheckGolden(),
func(t *testing.T, ctx *core.CheckFuncCtx) {
Expand All @@ -509,6 +509,7 @@ func Test_CreateServerScratchStorage(t *testing.T) {
assert.Equal(t, additionalVolume.VolumeType, instance.VolumeServerVolumeTypeScratch)
},
),
AfterFunc: core.ExecAfterCmd("scw instance server delete {{ .CmdResult.ID }} zone=fr-par-2 with-volumes=all with-ip=true force-shutdown=true"),
DisableParallel: true,
}))
}
Loading