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

Merge partial-fix-1063912-ptc-pxc-slaves/ -r403..405

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-08 12:53:54 -06:00
parent 9c4517f55f
commit b2cb95940f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-table-checksum
View File

@@ -3320,7 +3320,9 @@ sub is_cluster_node {
PTDEBUG && _d($sql); PTDEBUG && _d($sql);
my $row = $self->{dbh}->selectrow_arrayref($sql); my $row = $self->{dbh}->selectrow_arrayref($sql);
PTDEBUG && _d(defined $row ? @$row : 'undef'); PTDEBUG && _d(defined $row ? @$row : 'undef');
$self->{is_cluster_node} = $row && $row->[0] ? 1 : 0; $self->{is_cluster_node} = $row && $row->[1]
? ($row->[1] eq 'ON' || $row->[1] eq '1')
: 0;
return $self->{is_cluster_node}; return $self->{is_cluster_node};
} }
@@ -11313,6 +11315,12 @@ nodes and regular replicas because nodes are not regular replicas so they
cannot be detected automatically. The lag check (see L<"REPLICA CHECKS">) cannot be detected automatically. The lag check (see L<"REPLICA CHECKS">)
is not performed for cluster nodes. is not performed for cluster nodes.
Mixed replication setups are not currently supported. For example, the tool
does not work completely if the master host is replicating to a cluster,
or if the cluster is replicating to another cluster. In short, the only
supported setup is a single cluster with nodes optionally having traditional
replication slaves.
=back =back
=head1 BUGS =head1 BUGS

4
lib/Cxn.pm
View File

@@ -203,7 +203,9 @@ sub is_cluster_node {
PTDEBUG && _d($sql); PTDEBUG && _d($sql);
my $row = $self->{dbh}->selectrow_arrayref($sql); my $row = $self->{dbh}->selectrow_arrayref($sql);
PTDEBUG && _d(defined $row ? @$row : 'undef'); PTDEBUG && _d(defined $row ? @$row : 'undef');
$self->{is_cluster_node} = $row && $row->[0] ? 1 : 0; $self->{is_cluster_node} = $row && $row->[1]
? ($row->[1] eq 'ON' || $row->[1] eq '1')
: 0;
return $self->{is_cluster_node}; return $self->{is_cluster_node};
} }