Skip to content

integration: retry UC schema and volume creation in TemporaryVolume #7608

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

Open
denik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

integration: retry UC schema and volume creation in TemporaryVolume #7608

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
45 changes: 37 additions & 8 deletions integration/internal/acc/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package acc

import (
"context"
"errors"
"fmt"

"github.com/databricks/cli/internal/testutil"
"github.com/databricks/cli/libs/retry"
"github.com/databricks/databricks-sdk-go/apierr"
"github.com/databricks/databricks-sdk-go/service/catalog"
"github.com/databricks/databricks-sdk-go/service/files"
Expand Down Expand Up @@ -104,9 +106,14 @@ func TemporaryVolume(t *WorkspaceT) string {
w := t.W

// Create a schema
schema, err := w.Schemas.Create(ctx, catalog.CreateSchema{
CatalogName: "main",
Name: testutil.RandomName("test-schema-"),
schemaName := testutil.RandomName("test-schema-")
schema, err := createRetryingTransient(ctx, func() (*catalog.SchemaInfo, error) {
return w.Schemas.Create(ctx, catalog.CreateSchema{
CatalogName: "main",
Name: schemaName,
})
}, func() (*catalog.SchemaInfo, error) {
return w.Schemas.GetByFullName(ctx, "main."+schemaName)
})
require.NoError(t, err)
t.Cleanup(func() {
Expand All @@ -117,11 +124,15 @@ func TemporaryVolume(t *WorkspaceT) string {
})

// Create a volume
volume, err := w.Volumes.Create(ctx, catalog.CreateVolumeRequestContent{
CatalogName: "main",
SchemaName: schema.Name,
Name: "my-volume",
VolumeType: catalog.VolumeTypeManaged,
volume, err := createRetryingTransient(ctx, func() (*catalog.VolumeInfo, error) {
return w.Volumes.Create(ctx, catalog.CreateVolumeRequestContent{
CatalogName: "main",
SchemaName: schema.Name,
Name: "my-volume",
VolumeType: catalog.VolumeTypeManaged,
})
}, func() (*catalog.VolumeInfo, error) {
return w.Volumes.ReadByName(ctx, schema.FullName+".my-volume")
})
require.NoError(t, err)
t.Cleanup(func() {
Expand All @@ -133,3 +144,21 @@ func TemporaryVolume(t *WorkspaceT) string {

return fmt.Sprintf("/Volumes/%s/%s/%s", "main", schema.Name, volume.Name)
}

// createRetryingTransient retries create on transient errors such as a
// connection cut mid-response ("unexpected EOF"), which the SDK does not retry
// for a POST. The request may have been applied before the connection broke, so
// a 409 on a retry is our own resource and get returns it; the name is unique to
// this test, so nothing else could have created it. ErrResourceConflict also
// matches service-specific already-exists codes the SDK does not map by name.
func createRetryingTransient[T any](ctx context.Context, create, get func() (T, error)) (T, error) {
attempt := 0
return retry.With(ctx, retry.IsTransientRead, func() (T, error) {
attempt++
result, err := create()
if attempt > 1 && errors.Is(err, apierr.ErrResourceConflict) {
return get()
}
return result, err
})
}
Loading