Skip to content

fix(block_volume): wait for status available before deletion #2931

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
Feb 21, 2025
Merged

fix(block_volume): wait for status available before deletion #2931

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: 1 addition & 1 deletion internal/services/block/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func ResourceBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, m in
return diag.FromErr(err)
}

_, err = waitForBlockVolume(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
_, err = waitForBlockVolumeToBeAvailable(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
if err != nil {
if httperrors.Is404(err) {
d.SetId("")
Expand Down
19 changes: 19 additions & 0 deletions internal/services/block/waiters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,25 @@ func waitForBlockVolume(ctx context.Context, blockAPI *block.API, zone scw.Zone,
return volume, err
}

func waitForBlockVolumeToBeAvailable(ctx context.Context, blockAPI *block.API, zone scw.Zone, id string, timeout time.Duration) (*block.Volume, error) {
retryInterval := defaultBlockRetryInterval
if transport.DefaultWaitRetryInterval != nil {
retryInterval = *transport.DefaultWaitRetryInterval
}

terminalStatus := block.VolumeStatusAvailable
volume, err := blockAPI.WaitForVolumeAndReferences(&block.WaitForVolumeAndReferencesRequest{
Zone: zone,
VolumeID: id,
RetryInterval: &retryInterval,
Timeout: scw.TimeDurationPtr(timeout),

VolumeTerminalStatus: &terminalStatus,
}, scw.WithContext(ctx))

return volume, err
}

func waitForBlockSnapshot(ctx context.Context, blockAPI *block.API, zone scw.Zone, id string, timeout time.Duration) (*block.Snapshot, error) {
retryInterval := defaultBlockRetryInterval
if transport.DefaultWaitRetryInterval != nil {
Expand Down
Loading