mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-16 16:23:30 +00:00
PT-2340 - Support MySQL 8.4
- Removed lib/Percona/Test.pm, lib/Safeguards.pm, t/lib/Safeguards.t, because they are not used anymore - Removed word "slave" from lib
This commit is contained in:
@@ -190,31 +190,31 @@ sub autodetect_nodes {
|
||||
seen_ids => $seen_ids
|
||||
);
|
||||
|
||||
my $new_slaves = [];
|
||||
my $new_replicas = [];
|
||||
foreach my $node (@$new_nodes) {
|
||||
my $node_slaves = $ms->get_slaves(
|
||||
my $node_replicas = $ms->get_replicas(
|
||||
dbh => $node->dbh(),
|
||||
dsn => $node->dsn(),
|
||||
make_cxn => $make_cxn,
|
||||
);
|
||||
push @$new_slaves, @$node_slaves;
|
||||
push @$new_replicas, @$node_replicas;
|
||||
}
|
||||
|
||||
$new_slaves = $self->remove_duplicate_cxns(
|
||||
cxns => $new_slaves,
|
||||
$new_replicas = $self->remove_duplicate_cxns(
|
||||
cxns => $new_replicas,
|
||||
seen_ids => $seen_ids
|
||||
);
|
||||
|
||||
# If some of the new slaves is a cluster node, autodetect new nodes
|
||||
# If some of the new replicas is a cluster node, autodetect new nodes
|
||||
# from there too.
|
||||
my @new_slave_nodes = grep { $self->is_cluster_node($_) } @$new_slaves;
|
||||
my @new_replica_nodes = grep { $self->is_cluster_node($_) } @$new_replicas;
|
||||
|
||||
my $slaves_of_slaves = $self->autodetect_nodes(
|
||||
my $replicas_of_replicas = $self->autodetect_nodes(
|
||||
%args,
|
||||
nodes => \@new_slave_nodes,
|
||||
nodes => \@new_replica_nodes,
|
||||
);
|
||||
|
||||
my @autodetected_nodes = ( @$new_nodes, @$new_slaves, @$slaves_of_slaves );
|
||||
my @autodetected_nodes = ( @$new_nodes, @$new_replicas, @$replicas_of_replicas );
|
||||
return \@autodetected_nodes;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user