percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-22 03:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for the previous commit

Browse Source
This commit is contained in:
Brian Fraser
2012-10-17 15:39:06 -03:00
parent 1875066868
commit 5a9cc13d6f
4 changed files with 112 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Cxn.pm
View File

@@ -36,6 +36,7 @@ use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Scalar::Util qw(blessed);
use constant {
PTDEBUG => $ENV{PTDEBUG} || 0,
# Hostnames make testing less accurate. Tests need to see
@@ -45,6 +46,15 @@ use constant {
PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0,
};
use Data::Dumper ();
sub Dumper {
local $Data::Dumper::Indent = 1;
local $Data::Dumper::Sortkeys = 1;
local $Data::Dumper::Quotekeys = 0;
Data::Dumper::Dumper(@_);
}
# Sub: new
#
# Required Arguments:
@@ -260,13 +270,20 @@ sub is_master_of {
my $cxn_dbh = $cxn->dbh;
local $cxn_dbh->{FetchHashKeyName} = 'NAME_lc';
my $slave_status = $cxn_dbh->selectrow_hashref(q{SHOW SLAVE STATUS});
my $sql = q{SHOW SLAVE STATUS};
PTDEBUG && _d($sql);
my $slave_status = $cxn_dbh->selectrow_hashref($sql);
return unless ref($slave_status) eq 'HASH';
my $port = $self->dsn->{P};
my $host = $self->dsn->{h};
return 1 if $slave_status->{master_host} eq $host
&& $slave_status->{master_port} eq $port;
my $port = $self->dsn->{P};
return unless $slave_status->{master_port} eq $port;
return 1 if $self->dsn->{h} eq $slave_status->{master_host};
# They might be the same but in different format
my $host = scalar gethostbyname($self->dsn->{h});
my $master_host = scalar gethostbyname($slave_status->{master_host});
return 1 if $master_host eq $host;
return;
}
sub _find_full_gcomm_addr {