[DBMON-5685] Ensure innodb lock queries respect disable_innodb_metrics config option #21421
+9
−3
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.
What does this PR do?
Originally we checked for
disable_innodb_metrics
before our innodb query toSHOW INNODB STATUS
but we've since extended support for querying for deadlocks frominformation_schema.INNODB_METRICS
. This second query isn't currently excluded when disabling innodb metrics which leads to a consistent query exception when using a different mysql engine or very old Mysql versions that don't haveinformation_schema.INNODB_METRICS
table.We already check if InnoDB engine is in use before issuing these queries, but if
INNODB_METRICS
table doesn't exist it will crash. This change moves evaluation of thedisable_innodb_metrics
config value into our_check_innodb_engine_enabled
function so that it's respected everywhere we query innodb allowing customers to disable them if desired.Motivation
This issue was raised in https://datadoghq.atlassian.net/browse/SDBM-2053
Review checklist (to be filled by reviewers)
qa/skip-qa
label if the PR doesn't need to be tested during QA.backport/<branch-name>
label to the PR and it will automatically open a backport PR once this one is merged