percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-1707 Updated MasterSlave in all scripts

Browse Source
This commit is contained in:
Carlos Salguero
2019-11-26 10:11:26 -03:00
parent 3d78e61e1d
commit a2159c259d
9 changed files with 90 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pt-archiver
View File

@@ -3767,7 +3767,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -3779,8 +3785,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-heartbeat
View File

@@ -312,7 +312,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -324,8 +330,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-kill
View File

@@ -4044,7 +4044,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -4056,8 +4062,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-online-schema-change
View File

@@ -4370,7 +4370,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -4382,8 +4388,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-query-digest
View File

@@ -10692,7 +10692,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -10704,8 +10710,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-slave-find
View File

@@ -2452,7 +2452,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -2464,8 +2470,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-slave-restart
View File

@@ -2863,7 +2863,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -2875,8 +2881,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-table-checksum
View File

@@ -5320,7 +5320,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -5332,8 +5338,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }

11
bin/pt-table-sync
View File

@@ -6846,7 +6846,13 @@ sub find_slave_hosts {
sub _find_slaves_by_processlist { sub _find_slaves_by_processlist {
my ( $self, $dsn_parser, $dbh, $dsn ) = @_; my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
my @connected_slaves = $self->get_connected_slaves($dbh);
my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
return @slaves;
}
sub _process_slaves_list {
my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
my @slaves = map { my @slaves = map {
my $slave = $dsn_parser->parse("h=$_", $dsn); my $slave = $dsn_parser->parse("h=$_", $dsn);
$slave->{source} = 'processlist'; $slave->{source} = 'processlist';
@@ -6858,8 +6864,11 @@ sub _find_slaves_by_processlist {
if ( $host eq 'localhost' ) { if ( $host eq 'localhost' ) {
$host = '127.0.0.1'; # Replication never uses sockets. $host = '127.0.0.1'; # Replication never uses sockets.
} }
if ($host =~ m/::/) {
$host = '['.$host.']';
}
$host; $host;
} $self->get_connected_slaves($dbh); } @$connected_slaves;
return @slaves; return @slaves;
} }