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.

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

Look for mariadbd process for MariaDB 10.5+ #9543

Merged
merged 2 commits into from
Jun 30, 2021

Conversation

ian28223
Copy link
Contributor

@ian28223 ian28223 commented Jun 17, 2021

What does this PR do?

Looks for mariadbd process instead of mysqld for MariaDB 10.5+

Motivation

AGENT-6383

Missing mysql.performance.cpu_time metric for MariaDB 10.5 hosts, though is is working for MariaDB 5.5 hosts.
It appears in version 10.4 the executable name was changed from mysql to mariadb.

Additional Notes

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached

@codecov
Copy link

codecov bot commented Jun 23, 2021

Codecov Report

Merging #9543 (a033af4) into master (0c5a76b) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Flag Coverage Δ
mysql 84.82% <100.00%> (-0.64%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@ian28223 ian28223 force-pushed the ian.bucad/mariadb_105_procname branch from 89d1246 to 2c3efaa Compare June 23, 2021 04:39
@hithwen
Copy link
Contributor

hithwen commented Jun 23, 2021

Can you add a new tox env for maria 10.5? (I suggest renaming the existing one), we can also remove 5.6 in exchange since it EOLed in February 2021.

py{27,38}-{5.7,8.0,maria-10.2,maria-10.5}

And then in setenv:

setenv =
...
    maria-10.2: MYSQL_VERSION=10.2.27
    maria-10.5: MYSQL_VERSION=10.5.10

@ian28223 ian28223 marked this pull request as draft June 24, 2021 00:25
@ian28223 ian28223 force-pushed the ian.bucad/mariadb_105_procname branch from b7a2b76 to a033af4 Compare June 30, 2021 05:48
@ian28223 ian28223 marked this pull request as ready for review June 30, 2021 05:49
@FlorianVeaux FlorianVeaux merged commit a092c78 into master Jun 30, 2021
@FlorianVeaux FlorianVeaux deleted the ian.bucad/mariadb_105_procname branch June 30, 2021 08:52
@coignetp coignetp mentioned this pull request Jul 16, 2021
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants