Skip to content

Commit

Permalink
Merge pull request hashicorp#27845 from hashicorp/alisdair/fix-remote…
Browse files Browse the repository at this point in the history
…-backend-state-lock-timeout

backend/remote: Fix broken state lock retry
  • Loading branch information
alisdair authored Feb 22, 2021
2 parents 7b7273e + 02eb283 commit 4ccd818
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions backend/remote/backend_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ func (r *remoteClient) Lock(info *statemgr.LockInfo) (string, error) {
})
if err != nil {
if err == tfe.ErrWorkspaceLocked {
lockErr.Info = info
err = fmt.Errorf("%s (lock ID: \"%s/%s\")", err, r.organization, r.workspace.Name)
}
lockErr.Err = err
Expand Down

0 comments on commit 4ccd818

Please sign in to comment.