percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 02:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify how Pingback handles MySQL instances. Remove Percona::Toolkit::slurp_file() because it was causing 'sub redefined' errors, probably due to PerconaTest::slurp_file(). Add more PTVCDEBUG statements.

Browse Source
This commit is contained in:
Daniel Nichter
2012-08-27 17:10:42 -06:00
parent a08bf4c4fc
commit 98338b6508
26 changed files with 2966 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/VersionCheck.pm
View File

@@ -86,8 +86,7 @@ sub get_versions {
die "I need a $arg arugment" unless $args{$arg};
}
my ($items) = @args{@required_args};
my $instances = $args{instances};
my %versions;
foreach my $item ( values %$items ) {
next unless $self->valid_item($item);
@@ -96,7 +95,7 @@ sub get_versions {
my $func = 'get_' . $item->{type};
my $version = $self->$func(
item => $item,
instances => $instances,
instances => $args{instances},
);
if ( $version ) {
chomp $version unless ref($version);
@@ -231,14 +230,22 @@ sub get_mysql_variable {
sub _get_from_mysql {
my ($self, %args) = @_;
my $show = $args{show};
my $item = $args{item};
my $show = $args{show};
my $item = $args{item};
my $instances = $args{instances};
return unless $show && $item && %$instances;
return unless $show && $item;
if ( !$instances || !@$instances ) {
if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
_d('Cannot check', $item, 'because there are no MySQL instances');
}
return;
}
my @versions;
my %version_for;
for my $id ( keys %$instances ) {
my $dbh = $instances->{$id};
foreach my $instance ( @$instances ) {
my $dbh = $instance->{dbh};
local $dbh->{FetchHashKeyName} = 'NAME_lc';
my $sql = qq/SHOW $show/;
PTDEBUG && _d($sql);
@@ -248,11 +255,12 @@ sub _get_from_mysql {
foreach my $var ( @{$item->{vars}} ) {
$var = lc($var);
my $version = $rows->{$var}->{value};
PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version);
PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version,
'on', $instance->{name});
push @versions, $version;
}
$version_for{$id} = join(' ', @versions);
$version_for{ $instance->{id} } = join(' ', @versions);
}
return \%version_for;