Fix lock_wait_timeout after #259 #263
Merged
Conversation
This file contains hidden or 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
arvenil
commented
Jan 31, 2018
| slowLogFilter = kingpin.Flag( | ||
| "exporter.log_slow_filter", | ||
| "Add a log_slow_filter to avoid exessive MySQL slow logging. NOTE: Not supported by Oracle MySQL.", | ||
| "Add a log_slow_filter to avoid slow query logging of scrapes. NOTE: Not supported by Oracle MySQL.", |
Contributor
Author
There was a problem hiding this comment.
Just to make it in sync with what's in README.
| func New(dsn string, collect Collect) *Exporter { | ||
| // Setup extra params for the DSN, default to having a lock timeout. | ||
| dsnParams := []string{fmt.Sprintf(timeoutParam, exporterLockTimeout)} | ||
| dsnParams := []string{fmt.Sprintf(timeoutParam, *exporterLockTimeout)} |
Contributor
Author
There was a problem hiding this comment.
The actual fix, pass value with * instead of address.
| dsn = dsn + "?" + strings.Join(dsnParams, "&") | ||
| dsn = dsn + "?" | ||
| } | ||
| dsn += strings.Join(dsnParams, "&") |
Contributor
Author
There was a problem hiding this comment.
Just to drop logic dupe.
Closed
ezraroi
pushed a commit
to ezraroi/mysqld_exporter
that referenced
this pull request
Apr 17, 2018
# This is the 1st commit message: Move session params to DSN (prometheus#259) * Move session params to DSN In order to avoid lost session params if the `db` object reconnects in the background, move session params to the DSN string configuration. * Move log_slow_filter flag to exporter * Update flag name to be in `exporter` namespace. * Update README. * Tweak exporter.log_slow_filter flag documentation. # This is the commit message prometheus#2: Fix lock_wait_timeout after prometheus#259 (prometheus#263) # This is the commit message prometheus#3: Broken landing page, doesn't include metric path. (prometheus#264) * Broken landing page, doesn't include metric path. * Fix landing page. # This is the commit message prometheus#4: first commit Signed-off-by: Roi Ezra <ezraroi@gmail.com> # This is the commit message prometheus#5: fixed code review Signed-off-by: Roi Ezra <ezraroi@gmail.com> # This is the commit message prometheus#6: fixed code review Signed-off-by: Roi Ezra <ezraroi@gmail.com>
ezraroi
added a commit
to ezraroi/mysqld_exporter
that referenced
this pull request
Apr 17, 2018
Move session params to DSN (prometheus#259) * Move session params to DSN In order to avoid lost session params if the `db` object reconnects in the background, move session params to the DSN string configuration. * Move log_slow_filter flag to exporter * Update flag name to be in `exporter` namespace. * Update README. * Tweak exporter.log_slow_filter flag documentation. Fix lock_wait_timeout after prometheus#259 (prometheus#263) Broken landing page, doesn't include metric path. (prometheus#264) * Broken landing page, doesn't include metric path. * Fix landing page. first commit Signed-off-by: Roi Ezra <ezraroi@gmail.com> fixed code review Signed-off-by: Roi Ezra <ezraroi@gmail.com> fixed code review Signed-off-by: Roi Ezra <ezraroi@gmail.com> first commit Signed-off-by: Roi Ezra <ezraroi@gmail.com> fixed code review fixed code review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Passing
exporterLockTimeouttolock_wait_timeout=%dresults in large integer instead of expected default2or whatever user passes. This is becauseexporterLockTimeoutis a pointer so it results in passing memory address rather ofexporterLockTimeoutthan value ofexporterLockTimeout. Getting value with*solves the issue.Error I was getting: