-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.
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
add rejectReadOnly option (to fix AWS Aurora failover) #604
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a3bdfa2
add RejectReadOnly
songgao 6b8624c
update README.md
songgao 83d56b7
close connection explicitly before returning ErrBadConn for 1792 (#2)
songgao d2fefe8
add test and improve doc
songgao fb11b2c
Merge remote-tracking branch 'upstream/master'
songgao bf068b4
doc/comment changes
songgao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -59,4 +59,5 @@ Zhenye Xie <xiezhenye at gmail.com> | |
|
||
Barracuda Networks, Inc. | ||
Google Inc. | ||
Keybase Inc. | ||
Stripe Inc. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,6 +53,7 @@ type Config struct { | |
InterpolateParams bool // Interpolate placeholders into query string | ||
MultiStatements bool // Allow multiple statements in one query | ||
ParseTime bool // Parse time values to time.Time | ||
RejectReadOnly bool // Reject read-only connections; see README.md | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove the "; see README.md", all of these params are explained in the README.md |
||
Strict bool // Return warnings as errors | ||
} | ||
|
||
|
@@ -195,6 +196,15 @@ func (cfg *Config) FormatDSN() string { | |
buf.WriteString(cfg.ReadTimeout.String()) | ||
} | ||
|
||
if cfg.RejectReadOnly { | ||
if hasParam { | ||
buf.WriteString("&rejectReadOnly=true") | ||
} else { | ||
hasParam = true | ||
buf.WriteString("?rejectReadOnly=true") | ||
} | ||
} | ||
|
||
if cfg.Strict { | ||
if hasParam { | ||
buf.WriteString("&strict=true") | ||
|
@@ -472,6 +482,14 @@ func parseDSNParams(cfg *Config, params string) (err error) { | |
return | ||
} | ||
|
||
// Reject read-only connections | ||
case "rejectReadOnly": | ||
var isBool bool | ||
cfg.RejectReadOnly, isBool = readBool(value) | ||
if !isBool { | ||
return errors.New("invalid bool value: " + value) | ||
} | ||
|
||
// Strict mode | ||
case "strict": | ||
var isBool bool | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/mysql driver/the driver/
Please keep the explanation general, i.e. independent from AWS Aurora, which can however be mentioned as an example. For example explain that failover instances might be read-only and that this option purges them from the connection pool. Please also don't mention internals like "returning a driver.ErrBadConnection".