Skip to content

This PR fixes an intermittent race condition where concurrent workspace_file resource creations would collide when automatically creating the target parent directory via client.Workspace.Mkdirs. #3

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
gustavo89587 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

This PR fixes an intermittent race condition where concurrent workspace_file resource creations would collide when automatically creating the target parent directory via client.Workspace.Mkdirs. #3

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
38 changes: 27 additions & 11 deletions workspace/resource_workspace_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// file: workspace/resource_workspace_file.go
package workspace

import (
"bytes"
"context"
"log"
"path/filepath"
"strings"

"github.com/databricks/databricks-sdk-go/apierr"
"github.com/databricks/databricks-sdk-go/service/workspace"
"github.com/databricks/terraform-provider-databricks/common"

Expand All @@ -19,7 +20,7 @@ func workspaceFileUploadOptionFunc(i *workspace.Import) {
i.ForceSendFields = []string{"Content"}
}

// ResourceWorkspaceFile manages files in workspace

func ResourceWorkspaceFile() common.Resource {
s := FileContentSchema(map[string]*schema.Schema{
"url": {
Expand Down Expand Up @@ -54,23 +55,38 @@ func ResourceWorkspaceFile() common.Resource {
return err
}
path := d.Get("path").(string)


err = client.Workspace.Upload(ctx, path, bytes.NewReader(content), workspaceFileUploadOptionFunc)
if err != nil {
// If upload failed, check if the parent folder is missing and create it.
parent := filepath.ToSlash(filepath.Dir(path))


_, errStatus := client.Workspace.GetStatusByPath(ctx, parent)
if errStatus != nil && apierr.IsMissing(errStatus) {
log.Printf("[DEBUG] Parent folder '%s' doesn't exist, creating...", parent)
if errStatus = client.Workspace.MkdirsByPath(ctx, parent); errStatus != nil {
return errStatus
if errStatus != nil {
log.Printf("[DEBUG] Parent folder '%s' check failed, executing concurrent safe mkdirs...", parent)


errMkdir := client.Workspace.Mkdirs(ctx, workspace.Mkdirs{Path: parent})
if errMkdir != nil {
errStr := strings.ToUpper(errMkdir.Error())
if !strings.Contains(errStr, "RESOURCE_ALREADY_EXISTS") &&
!strings.Contains(errStr, "ALREADY_EXISTS") {
return errMkdir
}
}

err = client.Workspace.Upload(ctx, path, bytes.NewReader(content), workspaceFileUploadOptionFunc)
}
if err != nil {
if err != nil {
return err
}
} else {

return err
}
}
d.SetId(path)

d.SetId(path)
return nil
},
Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
Expand Down Expand Up @@ -106,4 +122,4 @@ func ResourceWorkspaceFile() common.Resource {
return client.Workspace.Delete(ctx, workspace.Delete{Path: d.Id(), Recursive: false})
},
}
}
}