Page MenuHomePhabricator

Upgrade wmf-pt-kill package for Debian Buster
Closed, ResolvedPublic

Description

I think @Marostegui mentioned that the pt-kill patched version we maintain at WMF (T203674, T183983) for stretch works without change on buster. However, it would be nice to have an "upgraded" package, with an upgraded pt-kill version that either already fixes or may need a slightly different patch. It would also be nice to recheck dependencies, systemd mangement, etc. for the new version.

This would be a soft blocker for the labsdb* hosts upgrade to buster.

Event Timeline

jcrespo triaged this task as Medium priority.Mar 30 2020, 11:18 AM
jcrespo moved this task from Triage to Pending comment on the DBA board.
jcrespo updated the task description. (Show Details)

Just a side note, the _current_ package does work on buster: T242702#5915709 that's why this is a "soft" blocker for labsdb host, as the upgrade can proceed and we can install that package manually till we've got the Buster proper version

Not sure if it is worth packaging the new version of pt-kill, as that's the one we found that wasn't working. We are patching 2.2.20 and the current release is 3.10 but the last change made to pt-kill was on 3.0.8 (https://www.percona.com/doc/percona-toolkit/3.0/release_notes.html#v3-1-0-released-2019-09-12):

v3.0.8 released 2018-03-13¶
New Features

PT-1500: Added –output=secure-slowlog option to pt-query-digest
Buf Fixes

PT-1503: The post-install script fails on VM due to improper UUID file detection
PT-1492: pt-kill in version 3.0.7 ignores the value of the --busy-time

However, that version doesn't fix the issue: https://jira.percona.com/browse/PT-167?focusedCommentId=250769&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-250769 and https://jira.percona.com/browse/PT-167?focusedCommentId=250875&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-250875

So I would prefer to keep using 2.2.20.
I am going to ping Percona again.

I have compiled the package on Debian Buster and installed it for testing on db1077 (buster, test-s4):

root@db1077:/var/log/wmf-pt-kill# systemctl start wmf-pt-kill.service
root@db1077:/var/log/wmf-pt-kill# ps aux | grep wmf
wmf-pt-+  2704  0.0  0.0  36256 18204 ?        Ss   13:03   0:00 perl /usr/bin/wmf-pt-kill --daemon --print --kill --victims all --interval 10 --busy-time 14400 --match-command Query|Execute --match-user ^[spu][0-9] --log /var/log/wmf-pt-kill/wmf-pt-kill.log -S /run/mysqld/mysqld.sock F=/dev/null

I am going to give it some more testing before pushing it to the repo and sending the patch.

Package: wmf-pt-kill
Status: install ok installed
Priority: optional
Section: database
Installed-Size: 272
Maintainer: Manuel Arostegui, <marostegui@wikimedia.org>, Balazs Pocze <bpocze@wikimedia.org>
Architecture: all
Version: 2.2.20-1+wmf6
Depends: sysuser-helper (<< 1.4), libdbi-perl, libdbd-mysql-perl
Conffiles:
 /etc/default/wmf-pt-kill dea612e18e7706e5db483036d2296e13
 /etc/logrotate.d/wmf-pt-kill 581a9b398134526afdc96697eb4ff243
Description: WMF fork of Perconas pt-kill
  WMF needs a patched version of pt-kill, because
  the original one ignores the --busy-time value,
  which is patched in this version.
  This package also contains configuration and systemd
  service for runnint pt-kill as a daemon.
  See: T183983 and T203674
  Upstream bug: https://jira.percona.com/browse/PT-548 ,
  https://jira.percona.com/browse/PT-1492
Description-md5: ad61757099d01d0108b43b0f56462a02
Homepage: https://www.percona.com/doc/percona-toolkit/2.2/index.html
``
This comment was removed by Marostegui.

I can make an attempt to update the upstream next week; at a later time, with lower priority.

I can make an attempt to update the upstream next week; at a later time, with lower priority.

Sounds good thank you! The last time I checked as you can see at T248843#6010024 it still had the bug though

Change 584814 had a related patch set uploaded (by Marostegui; owner: Marostegui):
[operations/debs/wmf-pt-kill@master] wmf-pt-kill: Update package to PT 3.1.0

https://gerrit.wikimedia.org/r/584814

Change 584814 merged by Marostegui:
[operations/debs/wmf-pt-kill@master] wmf-pt-kill: Update package to PT 3.1.0

https://gerrit.wikimedia.org/r/584814

One last thing, on the package, the patch is ok, but the file on /bin seems not touched. Not sure if that shouldn't be there at all or yes, but updated (could be an existing bug).

wmf-pt-kill_2.2.20.orig.tar.xz also needs deletion (it is now a duplicate).

Not sure what you mean:

root@db1077:/home/marostegui# head /usr/bin/wmf-pt-kill
#!/usr/bin/env perl

### wmf-pt-kill ###
# Patched version of wmf-pt-kill for Wikimedia Foundation (https://phabricator.wikimedia.org/T183983#3983899)

root@db1077:/home/marostegui# tail /usr/bin/wmf-pt-kill

You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA  02111-1307  USA.

=head1 VERSION

wmf-pt-kill 3.1.0

=cut

The file on ~/wmf-pt-kill_3.1.0.orig/bin/ is the original non patched one.

The file on ~/wmf-pt-kill_3.1.0.orig/bin/ is the original non patched one.

Yes, that is to be expected.

But see: https://github.com/wikimedia/operations-debs-wmf-pt-kill/blob/master/bin/wmf-pt-kill (outdated) and

https://github.com/wikimedia/operations-debs-wmf-pt-kill/blob/master/wmf-pt-kill_2.2.20.orig.tar.xz (which should be deleted on HEAD).

Ah! You meant the old ones! Right, yeah. I will fix that

master/bin/wmf-pt-kill should either not exist (because it is decompressed and patched), or if it exists, be the new (3.1) file+patch.

I think it is just a repo issue, and that the actual package is being created correctly? :-D

The actual package is created correctly.
It is just a repo issue.

I will update the original wmf-pt-kill to the 3.1 (that is, the non patched version)
And will deleted the old orig.tar.xz

Change 585495 had a related patch set uploaded (by Marostegui; owner: Marostegui):
[operations/debs/wmf-pt-kill@master] wmf-pt-kill: Update original binary

https://gerrit.wikimedia.org/r/585495

Change 585495 merged by Marostegui:
[operations/debs/wmf-pt-kill@master] wmf-pt-kill: Update original binary

https://gerrit.wikimedia.org/r/585495

Marostegui claimed this task.

This is all done - the package has been uploaded to the repo.