magic to check that tests didn't muck with test dataset

lib/PerconaTest.pm

@@ -64,6 +64,7 @@ our @EXPORT      = qw(
    throws_ok
    remove_traces
    test_bash_tool
+   verify_test_data_integrity
    $trunk
    $dsn_opts
    $sandbox_version

lib/Sandbox.pm

@@ -178,26 +178,24 @@ sub wipe_clean {
       }
    }
    foreach my $db ( @{$dbh->selectcol_arrayref('SHOW DATABASES')} ) {
-      next if $db eq 'mysql';
+      next if $db =~ m/(mysql|information_schema|sakila|performance_schema|percona_test)$/;
-      next if $db eq 'information_schema';
-      next if $db eq 'performance_schema';
-      next if $db eq 'sakila';
       $dbh->do("DROP DATABASE IF EXISTS `$db`");
    }
    return;
 }
 
+# Returns a string if there is a problem with the master.
 sub master_is_ok {
    my ($self, $master) = @_;
    my $master_dbh = $self->get_dbh_for($master);
    if ( !$master_dbh ) {
-      warn "Sandbox $master " . $port_for{$master} . " is down\n";
+      return "Sandbox $master " . $port_for{$master} . " is down.";
-      return 0;
    }
    $master_dbh->disconnect();
-   return 1;
+   return '';
 }
 
+# Returns a string if there is a problem with the slave.
 sub slave_is_ok {
    my ($self, $slave, $master, $ro) = @_;
    PTDEBUG && _d('Checking if slave', $slave, $port_for{$slave},
@@ -205,31 +203,27 @@ sub slave_is_ok {
 
    my $slave_dbh = $self->get_dbh_for($slave);
    if ( !$slave_dbh ) {
-      warn "Sandbox $slave " . $port_for{$slave} . " is down\n";
+      return  "Sandbox $slave " . $port_for{$slave} . " is down.";
-      return 0;
    }
 
    my $master_port = $port_for{$master};
    my $status = $slave_dbh->selectall_arrayref(
       "SHOW SLAVE STATUS", { Slice => {} });
    if ( !$status || !@$status ) {
-      warn "Sandbox $slave " . $port_for{$slave} . " is not a slave\n";
+      return "Sandbox $slave " . $port_for{$slave} . " is not a slave.";
-      return 0;
    }
 
    if ( $status->[0]->{last_error} ) {
-      warn "Sandbox $slave " . $port_for{$slave} . " is broken: "
-         . $status->[0]->{last_error} . "\n";
       warn Dumper($status);
-      return 0;
+      return "Sandbox $slave " . $port_for{$slave} . " is broken: "
+         . $status->[0]->{last_error} . ".";
    }
 
    foreach my $thd ( qw(slave_io_running slave_sql_running) ) {
       if ( ($status->[0]->{$thd} || 'No') eq 'No' ) {
-         warn "Sandbox $slave " . $port_for{$slave} . " $thd thread "
-            . "is not running\n";
          warn Dumper($status);
-         return 0;
+         return "Sandbox $slave " . $port_for{$slave} . " $thd thread "
+            . "is not running.";
       }
    }
 
@@ -237,8 +231,7 @@ sub slave_is_ok {
       my $row = $slave_dbh->selectrow_arrayref(
          "SHOW VARIABLES LIKE 'read_only'");
       if ( !$row || $row->[1] ne 'ON' ) {
-         warn "Sandbox $slave " . $port_for{$slave} . " is not read-only\n";
+         return "Sandbox $slave " . $port_for{$slave} . " is not read-only.";
-         return 0;
       }
    }
 
@@ -259,32 +252,36 @@ sub slave_is_ok {
 
    PTDEBUG && _d('Slave', $slave, $port_for{$slave}, 'is ok');
    $slave_dbh->disconnect();
-   return 1;
+   return '';
 }
 
+# Returns a string if any leftoever servers were left running.
 sub leftover_servers {
    my ($self) = @_;
    PTDEBUG && _d('Checking for leftover servers');
-   my $leftovers = 0;
    foreach my $serverno ( 1..6 ) {
       my $server = "master$serverno";
       my $dbh = $self->get_dbh_for($server);
       if ( $dbh ) {
-         warn "Sandbox $server " . $port_for{$server} . " was left up\n";
          $dbh->disconnect();
-         $leftovers = 1;
+         return "Sandbox $server " . $port_for{$server} . " was left up.";
       }
    }
-   return $leftovers;
+   return '';
 }
 
+# This returns an empty string if all servers and data are OK. If it returns
+# anything but empty string, there is a problem, and the string indicates what
+# the problem is.
 sub ok {
    my ($self) = @_;
-   return 0 unless $self->master_is_ok('master');
+   my @errors;
-   return 0 unless $self->slave_is_ok('slave1', 'master');
+   push @errors, $self->master_is_ok('master');
-   return 0 unless $self->slave_is_ok('slave2', 'slave1', 1);
+   push @errors, $self->slave_is_ok('slave1', 'master');
-   return 0 if $self->leftover_servers();
+   push @errors, $self->slave_is_ok('slave2', 'slave1', 1);
-   return 1;
+   push @errors, $self->leftover_servers();
+   push @errors, $self->verify_test_data_integrity();
+   return join(' ', grep { $_ ne '' } @errors);
 }
 
 sub _d {
@@ -295,6 +292,42 @@ sub _d {
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
+# Verifies that master, slave1, and slave2 have a faithful copy of the mysql and
+# sakila databases. The reference data is inserted into percona_test.checksums
+# by util/checksum-test-dataset when sandbox/test-env starts the environment.
+sub verify_test_data_integrity {
+   my ($self) = @_;
+   my $master = $self->get_dbh_for('master');
+   my $ref    = $master->selectall_hashref(
+      'SELECT * FROM percona_test.checksums',
+      'db_tbl');
+   my @tables_in_mysql  = @{$master->selectcol_arrayref('SHOW TABLES FROM mysql')};
+   my @tables_in_sakila = qw( actor address category city country customer
+                              film film_actor film_category film_text inventory
+                              language payment rental staff store );
+   my $sql = "CHECKSUM TABLES "
+           . join(", ", map { "mysql.$_" } @tables_in_mysql)
+           . ", "
+           . join(", ", map { "sakila.$_" } @tables_in_sakila);
+
+   my @diffs;
+   foreach my $inst (qw(master slave1 slave2)) {
+      my $dbh = $self->get_dbh_for($inst);
+      my @checksums = @{$dbh->selectall_arrayref($sql, {Slice => {} })};
+      foreach my $c ( @checksums ) {
+         if ( $c->{checksum} ne $ref->{$c->{table}}->{checksum} ) {
+            push @diffs, $c->{table};
+         }
+      }
+      $dbh->disconnect;
+   }
+   $master->disconnect;
+   if ( @diffs ) {
+      return "Tables with differences: " . join(', ', @diffs);
+   }
+   return '';
+}
+
 1;
 }
 # ###########################################################################

sandbox/test-env

@@ -284,6 +284,7 @@ case $opt in
          if [ $? -eq 0 -a "$MYSQL_VERSION" '>' "4.1" ]; then
             echo -n "Loading sakila database... "
             ./load-sakila-db 12345
+            ../util/checksum-test-dataset
             exit_status=$((exit_status | $?)) 
             if [ $? -ne 0 ]; then
                echo "FAILED"

t/pt-slave-delay/auto_restart.t

@@ -107,5 +107,5 @@ waitpid ($pid, 0);
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+is($sb->verify_test_data_integrity(), '', "Sandbox dataset undefiled");
 exit;

t/pt-table-checksum/basics.t

@@ -461,5 +461,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+is($sb->ok(), '', "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

util/checksum-test-dataset

@@ -0,0 +1,60 @@
+#!/usr/bin/env perl
+
+# This program is copyright 2009-2011 Percona Inc.
+# Feedback and improvements are welcome.
+#
+# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
+# systems, you can issue `man perlgpl' or `man perlartistic' to read these
+# licenses.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA  02111-1307  USA.
+
+# This program is intended to be run after loading Sakila into our test
+# database, when starting the "sandbox" MySQL instances. It will store the
+# checksums of all of the mysql and sakila tables into a magical
+# percona_test.checksums table on instance 12345. Afterwards, one can verify the
+# integrity of all of these tables by running
+# lib/Sandbox.pm::verify_test_data_integrity() which will checksum the master
+# and all of the slaves, and make sure all are OK.
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use DBI;
+
+my $dbh = DBI->connect(
+   'DBI:mysql:;host=127.0.0.1;port=12345;', 'msandbox', 'msandbox',
+   {
+      AutoCommit         => 0,
+      RaiseError         => 1,
+      PrintError         => 0,
+      ShowErrorStatement => 0,
+   });
+
+my @tables_in_mysql  = @{$dbh->selectcol_arrayref('SHOW TABLES FROM mysql')};
+my @tables_in_sakila = qw( actor address category city country customer
+                           film film_actor film_category film_text inventory
+                           language payment rental staff store );
+$dbh->do("CREATE DATABASE IF NOT EXISTS percona_test");
+$dbh->do("DROP TABLE IF EXISTS percona_test.checksums");
+$dbh->do("CREATE TABLE percona_test.checksums(
+          db_tbl varchar(128) not null primary key,
+          checksum int unsigned not null)");
+my $sql = "CHECKSUM TABLES "
+        . join(", ", map { "mysql.$_" } @tables_in_mysql)
+        . ", "
+        . join(", ", map { "sakila.$_" } @tables_in_sakila);
+my @checksums = @{$dbh->selectall_arrayref($sql, {Slice => {} })};
+foreach my $c ( @checksums ) {
+   $dbh->do("INSERT INTO percona_test.checksums(db_tbl, checksum)
+   VALUES('$c->{Table}', $c->{Checksum})");
+}
+$dbh->commit;