Merge lp:~percona-toolkit-dev/percona-toolkit/pt-table-checksum-requires-recursion-when-working-with-XtraDB-Cluster-node-1373937 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.12

[Frank Cizmich]

Now accepts --recurse-method=none on PXC , for when a user wants to checksum only one server for special purposes
(see https://bugs.launchpad.net/percona-toolkit/+bug/1373937 )

New behavior: Issues a warning but runs anyway.

Updated Docs

Created Test

[Daniel Nichter (daniel-nichter)]

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/pt-table-checksum-requires-recursion-when-working-with-XtraDB-Cluster-node-1373937]

630. By Frank Cizmich on 2014-11-05

removed warning. changed Doc

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2014-09-25 13:48:22 +0000
+++ bin/pt-table-checksum	2014-11-05 19:37:33 +0000
@@ -9363,9 +9363,11 @@
 
       if ( $cluster_name_for{$master_cxn} ) {
          if ( !@$slaves ) {
-            die $master_cxn->name() . " is a cluster node but no other nodes "
-               . "or regular replicas were found.  Use --recursion-method=dsn "
-               . "to specify the other nodes in the cluster.\n";
+            if ( ($o->get('recursion-method')->[0] || '') ne 'none' ) {
+               die $master_cxn->name() . " is a cluster node but no other nodes "
+                  . "or regular replicas were found.  Use --recursion-method=dsn "
+                  . "to specify the other nodes in the cluster.\n";
+            } 
          }
 
          # Make sure the master and all node are in the same cluster.
@@ -12240,9 +12242,13 @@
 The C<dsn> column contains a replica DSN like it would be given on the command
 line, for example: C<"h=replica_host,u=repl_user,p=repl_pass">.
 
-The C<none> method prevents the tool from connecting to any replicas.
-This effectively disables all the L<"REPLICA CHECKS"> because there will
-not be any replicas to check.  Therefore, this method is not recommended.
+The C<none> method makes the tool ignore all slaves and cluster nodes. This 
+method is not recommended because it effectively disables the 
+L<"REPLICA CHECKS"> and no differences can be found. It is useful, however, if 
+you only need to write checksums on the master or a single cluster node. The 
+safer alternative is C<--no-replicate-check>: the tool finds replicas and 
+cluster nodes, performs the L<"REPLICA CHECKS">, but does not check for 
+differences. See L<"--[no]replicate-check">.
 
 =item --replicate
 

=== modified file 't/pt-table-checksum/pxc.t'
--- t/pt-table-checksum/pxc.t	2013-04-12 15:58:10 +0000
+++ t/pt-table-checksum/pxc.t	2014-11-05 19:37:33 +0000
@@ -81,6 +81,17 @@
    "Dies if no other nodes are found"
 );
 
+
+($output, $exit_status) = full_output(
+   sub { pt_table_checksum::main(@args, '--recursion-method', 'none') },
+   stderr => 1,
+);
+
+ok (
+      $output =~ qr/WARNING/i && !$exit_status,
+      "Warns but doesn't die if --recursion-method=none - issue #1373937"
+);
+
 for my $args (
       ["using recusion-method=dsn", '--recursion-method', "dsn=$node1_dsn,D=dsns,t=dsns"],
       ["using recursion-method=cluster", '--recursion-method', 'cluster']
@@ -232,7 +243,7 @@
    # Wait for the slave to apply the binlogs from node1 (its master).
    # Then change it so it's not consistent.
    PerconaTest::wait_for_table($slave_dbh, 'test.t');
-   $sb->wait_for_slaves('cslave1');
+   $sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
    $slave_dbh->do("update test.t set c='zebra' where c='z'");
 
    $output = output(