mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-11 21:51:21 +00:00
Merge pull request #408 from percona/PT-1344
PBM-144 Updated MasterSlave to support hosts without port
This commit is contained in:
@@ -3745,6 +3745,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -321,6 +321,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -4027,6 +4027,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -4281,8 +4281,7 @@ sub recurse_to_slaves {
|
|||||||
PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
|
PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
|
||||||
};
|
};
|
||||||
if ( $EVAL_ERROR ) {
|
if ( $EVAL_ERROR ) {
|
||||||
#TODO REMOVE DEBUG
|
print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), "\n"
|
||||||
print STDERR "1> Cannot connect to ", $dp->as_string($slave_dsn), "\n"
|
|
||||||
or die "Cannot print: $OS_ERROR";
|
or die "Cannot print: $OS_ERROR";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -4350,6 +4349,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -10675,6 +10675,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -2435,6 +2435,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -2846,6 +2846,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -5299,6 +5299,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -6844,6 +6844,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
@@ -272,6 +272,7 @@ sub _find_slaves_by_processlist {
|
|||||||
grep { $_ }
|
grep { $_ }
|
||||||
map {
|
map {
|
||||||
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
my ( $host ) = $_->{host} =~ m/^([^:]+):/;
|
||||||
|
$host ||= $_->{host};
|
||||||
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.
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user