Merge lp:~percona-toolkit-dev/percona-toolkit/fix-ptc-slave-warn-bug-1087804 into lp:percona-toolkit/2.2

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2012-12-20 23:05:06 +0000
+++ bin/pt-table-checksum	2013-01-03 16:02:24 +0000
@@ -8741,6 +8741,15 @@
          } @$slaves;
       }
       PTDEBUG && _d(scalar @$slaves, 'slaves found');
+      if ( !@$slaves && $o->get('recursion-method')->[0] ne 'none' ) {
+         $exit_status |= 1;
+         if ( $o->get('quiet') < 2 ) {
+            warn "Diffs cannot be detected because no slaves were found.  "
+               . "Please read the --recursion-method documentation for "
+               . "information.\n";
+         }
+      }
+
 
       # https://bugs.launchpad.net/percona-toolkit/+bug/938068
       if ( $o->get('check-binlog-format') ) {
@@ -11490,6 +11499,13 @@
 
 Preferred recursion method for discovering replicas.  pt-table-checksum
 performs several L<"REPLICA CHECKS"> before and while running.
+
+Although replicas are not required to run pt-table-checksum, the tool
+cannot detect diffs on slaves that it cannot discover.  Therefore,
+a warning is printed and the L<"EXIT STATUS"> is non-zero if no replicas 
+are found and the method is not C<none>.  If this happens, try a different
+recursion method, or use the C<dsn> method to specify the replicas to check.
+
 Possible methods are:
 
   METHOD       USES

=== modified file 't/pt-table-checksum/basics.t'
--- t/pt-table-checksum/basics.t	2012-12-20 23:05:06 +0000
+++ t/pt-table-checksum/basics.t	2013-01-03 16:02:24 +0000
@@ -361,10 +361,11 @@
    stderr => 1,
 );
 
+# Before 2.2 the exit status was 0, but bug 1087804 changed this to 1.
 is(
    $exit_status,
-   0,
-   "No host in DSN, zero exit status"
+   1,
+   "No host in DSN, non-zero exit status"
 );
 
 is(
@@ -491,6 +492,55 @@
 );
 
 # #############################################################################
+# Bug 1087804: pt-table-checksum doesn't warn if no slaves are found
+# #############################################################################
+$sb->load_file('master', "$sample/dsn-table.sql");
+$master_dbh->do('TRUNCATE TABLE dsns.dsns');
+$sb->wait_for_slaves;
+
+my $slave1_dsn = $sb->dsn_for('slave1');
+
+$output = output(
+   sub { $exit_status = pt_table_checksum::main(@args,
+      qw(-t sakila.country),
+      "--recursion-method", "dsn=$slave1_dsn,t=dsns.dsns")
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/no slaves were found/,
+   "Warns if no slaves are found"
+);
+
+is(
+   $exit_status,
+   1,
+   '...exit status 1'
+);
+
+$output = output(
+   sub { $exit_status = pt_table_checksum::main(@args,
+      qw(-t sakila.country),
+      "--recursion-method", "none")
+   },
+   stderr => 1,
+);
+
+unlike(
+   $output,
+   qr/no slaves were found/,
+   "No warning if no slaves and --recursion-method=none"
+);
+
+is(
+   $exit_status,
+   0,
+   '...exit status 0'
+);
+
+# #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);