From 78994bac7c9ec2812fdde25164bad9ca5ea979b7 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 4 Jun 2014 15:37:08 +0200 Subject: [PATCH] version up : percona-toolkit 2.2.8. also cleanup pt-* commands in mariadb instanciation. --- component/percona-toolkit/buildout.cfg | 4 ++-- slapos/recipe/generic_mysql/__init__.py | 5 ----- stack/erp5/buildout.cfg | 2 +- stack/erp5/instance-mariadb.cfg.in | 5 ----- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/component/percona-toolkit/buildout.cfg b/component/percona-toolkit/buildout.cfg index 6542ff6eb..77098661e 100644 --- a/component/percona-toolkit/buildout.cfg +++ b/component/percona-toolkit/buildout.cfg @@ -10,8 +10,8 @@ parts = recipe = slapos.recipe.cmmi depends = ${perl:version} -version = 2.2.7 +version = 2.2.8 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz -md5sum = 7514af32e0edff70c4934da2e5e36303 +md5sum = c7fe343308898ad7f0c456c8394f2cbf configure-command = ${perl:location}/bin/perl Makefile.PL diff --git a/slapos/recipe/generic_mysql/__init__.py b/slapos/recipe/generic_mysql/__init__.py index 4fa4064be..7cb6c6fe4 100644 --- a/slapos/recipe/generic_mysql/__init__.py +++ b/slapos/recipe/generic_mysql/__init__.py @@ -162,7 +162,6 @@ class Recipe(GenericBaseRecipe): for pt_script_name in ( 'pt-align', 'pt-archiver', - 'pt-collect', 'pt-config-diff', 'pt-deadlock-logger', 'pt-diskstats', @@ -175,12 +174,10 @@ class Recipe(GenericBaseRecipe): 'pt-index-usage', 'pt-ioprofile', 'pt-kill', - 'pt-log-player', 'pt-mext', 'pt-mysql-summary', 'pt-online-schema-change', 'pt-pmp', - 'pt-query-advisor', 'pt-query-digest', 'pt-show-grants', 'pt-sift', @@ -192,8 +189,6 @@ class Recipe(GenericBaseRecipe): 'pt-table-checksum', 'pt-table-sync', 'pt-table-usage', - 'pt-tcp-model', - 'pt-trend', 'pt-upgrade', 'pt-variable-advisor', 'pt-visual-explain', diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index a6c6c56e1..04a6a906e 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -172,7 +172,7 @@ context = [template-mariadb] < = template-jinja2-base filename = instance-mariadb.cfg -md5sum = 49ae6f1bf97d3755978fe08b8e29fb5a +md5sum = e0c923a8195b5a36c7df766c1fb4bfdb extra-context = key coreutils_location coreutils:location key dcron_location dcron:location diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index 6acf65681..1b7f65835 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/stack/erp5/instance-mariadb.cfg.in @@ -64,7 +64,6 @@ mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade mysqld-binary = {{ mariadb_location }}/bin/mysqld pt-align-binary = {{ perl_siteprefix }}/bin/pt-align pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver -pt-collect-binary = {{ perl_siteprefix }}/bin/pt-collect pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger pt-diskstats-binary = {{ perl_siteprefix }}/bin/pt-diskstats @@ -77,12 +76,10 @@ pt-heartbeat-binary = {{ perl_siteprefix }}/bin/pt-heartbeat pt-index-usage-binary = {{ perl_siteprefix }}/bin/pt-index-usage pt-ioprofile-binary = {{ perl_siteprefix }}/bin/pt-ioprofile pt-kill-binary = {{ perl_siteprefix }}/bin/pt-kill -pt-log-player-binary = {{ perl_siteprefix }}/bin/pt-log-player pt-mext-binary = {{ perl_siteprefix }}/bin/pt-mext pt-mysql-summary-binary = {{ perl_siteprefix }}/bin/pt-mysql-summary pt-online-schema-change-binary = {{ perl_siteprefix }}/bin/pt-online-schema-change pt-pmp-binary = {{ perl_siteprefix }}/bin/pt-pmp -pt-query-advisor-binary = {{ perl_siteprefix }}/bin/pt-query-advisor pt-query-digest-binary = {{ perl_siteprefix }}/bin/pt-query-digest pt-show-grants-binary = {{ perl_siteprefix }}/bin/pt-show-grants pt-sift-binary = {{ perl_siteprefix }}/bin/pt-sift @@ -94,8 +91,6 @@ pt-summary-binary = {{ perl_siteprefix }}/bin/pt-summary pt-table-checksum-binary = {{ perl_siteprefix }}/bin/pt-table-checksum pt-table-sync-binary = {{ perl_siteprefix }}/bin/pt-table-sync pt-table-usage-binary = {{ perl_siteprefix }}/bin/pt-table-usage -pt-tcp-model-binary = {{ perl_siteprefix }}/bin/pt-tcp-model -pt-trend-binary = {{ perl_siteprefix }}/bin/pt-trend pt-upgrade-binary = {{ perl_siteprefix }}/bin/pt-upgrade pt-variable-advisor-binary = {{ perl_siteprefix }}/bin/pt-variable-advisor pt-visual-explain-binary = {{ perl_siteprefix }}/bin/pt-visual-explain -- 2.30.9