Skip to content
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

MySQL HA: Return an error if we fail to get a lock on standby #8229

Merged
merged 5 commits into from
Feb 5, 2020
Merged

MySQL HA: Return an error if we fail to get a lock on standby #8229

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f18031d
return an error if we fail to get a lock on standby
catsby Jan 23, 2020
6641c89
Merge branch 'master' into b-fix-mysql-lock-panic
catsby Feb 3, 2020
8ea43ab
Add regression test
catsby Feb 4, 2020
575c967
Merge branch 'b-fix-mysql-lock-panic' of github.com:hashicorp/vault i…
catsby Feb 4, 2020
16e3711
minor refactoring to remove a race condition in the test
catsby Feb 5, 2020
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
7 changes: 4 additions & 3 deletions physical/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,13 +442,14 @@ func (i *MySQLHALock) Lock(stopCh <-chan struct{}) (<-chan struct{}, error) {
func (i *MySQLHALock) attemptLock(key, value string, didLock chan struct{}, failLock chan error, releaseCh chan bool) {
lock, err := NewMySQLLock(i.in, i.logger, key, value)

// Set node value
i.lock = lock

if err != nil {
failLock <- err
return
}

// Set node value
i.lock = lock

err = lock.Lock()
if err != nil {
failLock <- err
Expand Down