Skip to content

fix(rdb): retry database read on transient_state 409 #3369

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 2 commits into from
Sep 29, 2025
Merged

fix(rdb): retry database read on transient_state 409 #3369

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
ba73bcc
fix(rdb): retry database read on transient_state 409 by waiting insta…
jremy42 Sep 29, 2025
94346d4
Merge branch 'master' into fix/rdb-retry-read-transient
jremy42 Sep 29, 2025
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
12 changes: 7 additions & 5 deletions internal/services/rdb/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,13 @@ func ResourceRdbDatabaseCreate(ctx context.Context, d *schema.ResourceData, m an
}

func getDatabase(ctx context.Context, api *rdb.API, r scw.Region, instanceID, dbName string) (*rdb.Database, error) {
res, err := api.ListDatabases(&rdb.ListDatabasesRequest{
Region: r,
InstanceID: instanceID,
Name: &dbName,
}, scw.WithContext(ctx))
res, err := retryRDBReadOnTransient(ctx, api, r, instanceID, func() (*rdb.ListDatabasesResponse, error) {
return api.ListDatabases(&rdb.ListDatabasesRequest{
Region: r,
InstanceID: instanceID,
Name: &dbName,
}, scw.WithContext(ctx))
})
if err != nil {
return nil, err
}
Expand Down
12 changes: 12 additions & 0 deletions internal/services/rdb/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
)

Expand Down Expand Up @@ -119,3 +120,14 @@ func LoadBalancerDiffSuppressFunc(k, oldValue, newValue string, d *schema.Resour

return false
}

// retryRDBReadOnTransient wraps a read action to handle transient_state (HTTP 409) by
// waiting for the instance to be ready, then retrying the action.
func retryRDBReadOnTransient[T any](ctx context.Context, api *rdb.API, region scw.Region, instanceID string, action func() (T, error)) (T, error) {
return transport.RetryOnTransientStateError(
action,
func() (*rdb.Instance, error) {
return waitForRDBInstance(ctx, api, region, instanceID, defaultInstanceTimeout)
},
)
}
Loading