Skip to content

Add filestore index mutex #9396

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
modular-magician merged 1 commit into from
Jun 18, 2021
Merged

Add filestore index mutex #9396

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
3 changes: 3 additions & 0 deletions .changelog/4886.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
filestore: fixed an issue in `google_filestore_instance` where creating two instances simultaneously resulted in an error.
```
21 changes: 21 additions & 0 deletions google/resource_filestore_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@ func resourceFilestoreInstanceCreate(d *schema.ResourceData, meta interface{}) e
obj["networks"] = networksProp
}

lockName, err := replaceVars(d, config, "filestore/{{project}}")
if err != nil {
return err
}
mutexKV.Lock(lockName)
defer mutexKV.Unlock(lockName)

url, err := replaceVars(d, config, "{{FilestoreBasePath}}projects/{{project}}/locations/{{zone}}/instances?instanceId={{name}}")
if err != nil {
return err
Expand Down Expand Up @@ -351,6 +358,13 @@ func resourceFilestoreInstanceUpdate(d *schema.ResourceData, meta interface{}) e
obj["fileShares"] = fileSharesProp
}

lockName, err := replaceVars(d, config, "filestore/{{project}}")
if err != nil {
return err
}
mutexKV.Lock(lockName)
defer mutexKV.Unlock(lockName)

url, err := replaceVars(d, config, "{{FilestoreBasePath}}projects/{{project}}/locations/{{zone}}/instances/{{name}}")
if err != nil {
return err
Expand Down Expand Up @@ -416,6 +430,13 @@ func resourceFilestoreInstanceDelete(d *schema.ResourceData, meta interface{}) e
}
billingProject = project

lockName, err := replaceVars(d, config, "filestore/{{project}}")
if err != nil {
return err
}
mutexKV.Lock(lockName)
defer mutexKV.Unlock(lockName)

url, err := replaceVars(d, config, "{{FilestoreBasePath}}projects/{{project}}/locations/{{zone}}/instances/{{name}}")
if err != nil {
return err
Expand Down