Merge lp:~percona-toolkit-dev/percona-toolkit/test-pt-osc-master-to-cluster into lp:percona-toolkit/2.2

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

21:04:23 + attest --verbose t/pt-online-schema-change/pxc.t t/pt-archiver/pxc.t t/pt-table-checksum/pxc.t t/pt-heartbeat/pxc.t
21:04:24 pt-online-schema-change/pxc.t pass
21:04:37 pt-archiver/pxc.t pass
21:04:50 pt-table-checksum/pxc.t pass
21:06:50 pt-heartbeat/pxc.t pass
21:07:51 All tests passed.
21:07:51 https://refute.testnoir.com/percona-toolkit/jobs/percona-toolkit-pxc-5.5/14/results
21:07:51 + EXIT_STATUS=0

review: Approve

=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2013-03-04 17:28:43 +0000
+++ bin/pt-heartbeat	2013-03-08 21:04:28 +0000
@@ -5395,7 +5395,7 @@
 
 =head1 SYNOPSIS
 
-Usage: pt-heartbeat [OPTION...] [DSN] --update|--monitor|--check|--stop
+Usage: pt-heartbeat [OPTIONS] [DSN] --update|--monitor|--check|--stop
 
 pt-heartbeat measures replication lag on a MySQL or PostgreSQL server.  You can
 use it to update a master or monitor a replica.  If possible, MySQL connection

=== modified file 'lib/Sandbox.pm'
--- lib/Sandbox.pm	2013-02-19 20:01:58 +0000
+++ lib/Sandbox.pm	2013-03-08 21:04:28 +0000
@@ -341,7 +341,7 @@
       sub {
          my ($pong) = $slave2_dbh->selectrow_array(
             "SELECT ping FROM percona_test.sentinel WHERE id=1 /* wait_for_slaves */");
-         return $ping eq $pong;
+         return $ping eq ($pong || '');
       }, undef, 300
    );
 }

=== modified file 'sandbox/jenkins-test'
--- sandbox/jenkins-test	2013-02-19 20:01:58 +0000
+++ sandbox/jenkins-test	2013-03-08 21:04:28 +0000
@@ -41,11 +41,13 @@
    ARCH="32"
 fi
 
+APP="${FORK:-"mysql"}"
+
 MYSQL_BIN_DIR="$HOME/mysql-bin"
 [ -d "$MYSQL_BIN_DIR" ] || mkdir "$MYSQL_BIN_DIR"
 
 find_mysql_base_dir() {
-   find "$MYSQL_BIN_DIR" -name "mysql-$1*" -type d | tail -n 1
+   find "$MYSQL_BIN_DIR" -name "$APP-$1*" -type d | tail -n 1
 }
 
 MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
@@ -59,14 +61,25 @@
 if [ -z "$MYSQL_BASE_DIR" ]; then
    (
       cd $MYSQL_BIN_DIR
-      wget -q -O mysql.tar.gz http://hackmysql.com/barebones/mysql/$MYSQL/$ARCH
+      wget -q -O mysql.tar.gz http://hackmysql.com/barebones/$APP/$MYSQL/$ARCH \
+         || exit 1
 	   tar xvfz mysql.tar.gz
       rm mysql.tar.gz
    )
    MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
 fi
 
-if [ -z "$("$MYSQL_BASE_DIR/bin/mysqld" -V)" ]; then
+if [ $APP = "mysql" ]; then
+   mysqld_check="$("$MYSQL_BASE_DIR/bin/mysqld" -V)"
+elif [ $APP = "pxc" ]; then
+   ip="$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public')"
+   mysqld_check="$("$MYSQL_BASE_DIR/bin/mysqld" -V --bind-address $ip)"
+else
+   echo "Invalid FORK=$APP" >&2
+   exit 1
+fi
+
+if [ -z "$mysqld_check" ]; then
    echo "$MYSQL_BASE_DIR/bin/mysqld does not execute" >&2
    exit 1
 fi
@@ -95,7 +108,14 @@
 sandbox/test-env checkconfig || exit 1
 sandbox/test-env stop        || exit 1
 sandbox/test-env kill        || exit 1
-sandbox/test-env start       || exit 1
+if [ $APP = "mysql" ]; then
+   sandbox/test-env start || exit 1
+elif [ $APP = "pxc" ]; then
+   sandbox/test-env start cluster || exit 1
+else
+   echo "Invalid FORK=$app" >&2
+   exit 1
+fi
 
 #######################
 # Set debug env vars. #
@@ -122,8 +142,6 @@
 #############
 # Clean up. #
 #############
-set +x
 sandbox/test-env stop
-set -x
 
 exit $EXIT_STATUS

=== modified file 'sandbox/start-sandbox'
--- sandbox/start-sandbox	2013-01-30 16:00:03 +0000
+++ sandbox/start-sandbox	2013-03-08 21:04:28 +0000
@@ -50,7 +50,6 @@
    if [ "${type}" = "cluster" ]; then
       cp $PERCONA_TOOLKIT_BRANCH/sandbox/servers/pxc/$version/my.sandbox.cnf /tmp/$port
 
-      local ip="$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public')"
       local libgalera="$PERCONA_TOOLKIT_SANDBOX/lib/libgalera_smm.so"
       local cluster_name="${CLUSTER_NAME:-"pt_sandbox_cluster"}"
       local cluster_address="gcomm://"
@@ -143,7 +142,6 @@
 
    /tmp/$port/use -e "CREATE DATABASE IF NOT EXISTS percona_test";
    /tmp/$port/use -e "CREATE TABLE IF NOT EXISTS percona_test.sentinel (id INT PRIMARY KEY, ping VARCHAR(64) NOT NULL DEFAULT '')";
-   /tmp/$port/use -e "REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '')";
 
    if [ -n "${MYSQL_UPGRADE:-""}" ]; then
       mysql_upgrade_on /tmp/$port/my.sandbox.cnf
@@ -225,7 +223,16 @@
 else
    die "Cannot find executable mysqld in $PERCONA_TOOLKIT_SANDBOX/bin, $PERCONA_TOOLKIT_SANDBOX/sbin or $PERCONA_TOOLKIT_SANDBOX/libexec."
 fi
-version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`;
+
+APP="${FORK:-"mysql"}"
+
+if [ $type = "cluster" -o $APP = "pxc" ]; then
+   ip=$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public')
+   version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V --bind-address $ip 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`;
+else
+   version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`;
+fi
+
 if [ ! -d "$PERCONA_TOOLKIT_BRANCH/sandbox/servers/$version" ]; then
    die "$PERCONA_TOOLKIT_BRANCH/sandbox/servers/$version does not exist."
 fi

=== modified file 'sandbox/test-env'
--- sandbox/test-env	2013-02-21 22:59:49 +0000
+++ sandbox/test-env	2013-03-08 21:04:28 +0000
@@ -334,10 +334,10 @@
             ../util/check-load-data
 
             ping=$(/tmp/12345/use -ss -e "SELECT MD5(RAND())")
-            /tmp/12345/use -e "UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1";
+            /tmp/12345/use -e "REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '$ping')";
             echo -n "Waiting for replication to finish..."
             for i in $(_seq 60); do
-               pong=$(/tmp/12347/use -ss -e 'SELECT ping FROM percona_test.sentinel WHERE id=1' 2>/dev/null)
+               pong=$(/tmp/12347/use -ss -e "SELECT ping FROM percona_test.sentinel WHERE id=1 AND ping='$ping'" 2>/dev/null)
                [ "$ping" = "$pong" ] && break
                echo -n '.'
                sleep 1
@@ -379,8 +379,9 @@
       done
       ;;
    restart)
-      $0 stop
-      $0 start
+      shift;
+      $0 stop "$@"
+      $0 start "$@"
       ;;
    status)
       sandbox_status 'master' '12345'

=== modified file 't/pt-heartbeat/pxc.t'
--- t/pt-heartbeat/pxc.t	2012-12-14 01:38:40 +0000
+++ t/pt-heartbeat/pxc.t	2013-03-08 21:04:28 +0000
@@ -81,7 +81,7 @@
       exit 1;
    }
    push @exec_pids, $pid;
-   
+
    PerconaTest::wait_for_files($pidfile);
    ok(
       -f $pidfile,
@@ -115,11 +115,13 @@
    "Sanity check: All nodes are in the heartbeat table"
 );
 
+# These values may be 0 or '' depending on whether or not a previous test
+# turned 12345 into a slave or not.  For this purpose 0 == undef == ''.
 my $only_slave_data = {
    map {
       $_ => {
-         relay_master_log_file => $rows->{$_}->{relay_master_log_file},
-         exec_master_log_pos   => $rows->{$_}->{exec_master_log_pos},
+         relay_master_log_file => $rows->{$_}->{relay_master_log_file} || undef,
+         exec_master_log_pos   => $rows->{$_}->{exec_master_log_pos}   || undef,
       } } keys %$rows
 };
 
@@ -132,7 +134,7 @@
       12347 => $same_data,
    },
    "Sanity check: No slave data (relay log or master pos) is stored"
-);
+) or diag(Dumper($rows));
 
 $output = output(sub{
       pt_heartbeat::main($node1_dsn, qw(-D test --check)),
@@ -235,11 +237,11 @@
    server => 'cslave1',
    type   => 'slave',
    master => 'node1',
-   env    => q/BINLOG_FORMAT="ROW"/,
+   env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
 $sb->create_dbs($slave_dbh, ['test']);
-
+$sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
 start_update_instance($sb->port_for('cslave1'));
 PerconaTest::wait_for_table($slave_dbh, "test.heartbeat", "1=1");
 
@@ -292,31 +294,37 @@
 my ($master_dbh, $master_dsn) = $sb->start_sandbox(
    server => 'cmaster',
    type   => 'master',
-   env    => q/BINLOG_FORMAT="ROW"/,
+   env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
 my $cmaster_port = $sb->port_for('cmaster');
 
 $sb->create_dbs($master_dbh, ['test']);
-
+$master_dbh->do("INSERT INTO percona_test.sentinel (id, ping) VALUES (1, '')");
 $master_dbh->do("FLUSH LOGS");
 $master_dbh->do("RESET MASTER");
 
 $sb->set_as_slave('node1', 'cmaster');
+$sb->wait_for_slaves(master => 'cmaster', slave => 'node1');
 
 start_update_instance($sb->port_for('cmaster'));
 PerconaTest::wait_for_table($node1, "test.heartbeat", "server_id=$cmaster_port");
 
-$output = output(sub{
-      pt_heartbeat::main($node1_dsn, qw(-D test --check --print-master-server-id)),
-   },
+# Auto-detecting the master id only works when ran on node1, the direct
+# slave of the master, because other nodes aren't slaves, but this could
+# be made to work; see the node autodiscovery branch.
+$output = output(
+   sub {
+      pt_heartbeat::main($node1_dsn,
+         qw(-D test --check --print-master-server-id)
+   )},
    stderr => 1,
 );
 
 like(
    $output,
    qr/^\d.\d{2} $cmaster_port$/,
-   "--print-master-id works for master -> $node1_port, when run from $node1_port"
+   "Auto-detect master ID from node1"
 );
 
 # Wait until node2 & node3 get cmaster in their heartbeat tables
@@ -324,38 +332,39 @@
 $sb->wait_for_slaves(master => 'node1', slave => 'node3');
 
 foreach my $test (
-   [ $node2_port, $node2_dsn, $node2 ],
-   [ $node3_port, $node3_dsn, $node3 ],
+   [ $node2_port, $node2_dsn, $node2, 'node2' ],
+   [ $node3_port, $node3_dsn, $node3, 'node3' ],
 ) {
-   my ($port, $dsn, $dbh) = @$test;
+   my ($port, $dsn, $dbh, $name) = @$test;
    
-   $output = output(sub{
-         pt_heartbeat::main($dsn, qw(-D test --check --print-master-server-id)),
-      },
+   $output = output(
+      sub {
+         pt_heartbeat::main($dsn,
+            qw(-D test --check --print-master-server-id)
+      )},
       stderr => 1,
    );
 
-   # This could be made to work, see the node autodiscovery branch
-   TODO: {
-      local $::TODO = "cmaster -> node1, other nodes can't autodetect the master";
-      like(
-         $output,
-         qr/$cmaster_port/,
-         "--print-master-id works for master -> $node1_port, when run from $port"
-      );
-   }
+   like(
+      $output,
+      qr/server's master could not be automatically determined/,
+      "Limitation: cannot auto-detect master id from $name"
+   );
 
-   $output = output(sub{
-         pt_heartbeat::main($dsn, qw(-D test --check --master-server-id), $cmaster_port),
-      },
+   $output = output(
+      sub {
+         pt_heartbeat::main($dsn,
+            qw(-D test --check --master-server-id), $cmaster_port
+      )},
       stderr => 1,
    );
 
    $output =~ s/\d\.\d{2}/0.00/g;
+
    is(
       $output,
       "0.00\n",
-      "--check + explicit --master-server-id work for master -> node1, run from $port"
+      "$name --check --master-server-id $cmaster_port"
    );
 }
 

=== modified file 't/pt-online-schema-change/pxc.t'
--- t/pt-online-schema-change/pxc.t	2013-03-02 17:17:23 +0000
+++ t/pt-online-schema-change/pxc.t	2013-03-08 21:04:28 +0000
@@ -119,7 +119,7 @@
    $exit,
    "wsrep_OSU_method=RSU: non-zero exit"
 ) or diag($output);
-print $output;
+
 like(
    $output,
    qr/wsrep_OSU_method=TOI is required.+?currently set to RSU/,
@@ -134,6 +134,56 @@
 ) or BAIL_OUT("Failed to restore wsrep_OSU_method=TOI");
 
 # #############################################################################
+# master -> cluster, run on master on table with foreign keys.
+# #############################################################################
+
+# CAREFUL: The master and the cluster are different, so don't do stuff
+# on the master that will conflict with stuff already done on the cluster.
+# And since we're using RBR, we have to do a lot of stuff on the master
+# again, manually, because REPLACE and INSERT IGNORE don't work in RBR
+# like they do SBR.
+
+my ($master_dbh, $master_dsn) = $sb->start_sandbox(
+   server => 'cmaster',
+   type   => 'master',
+   env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
+);
+
+$sb->set_as_slave('node1', 'cmaster');
+
+$sb->load_file('cmaster', "$sample/basic_with_fks.sql", undef, no_wait => 1);
+
+$master_dbh->do("SET SESSION binlog_format=STATEMENT");
+$master_dbh->do("REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '')");
+$sb->wait_for_slaves(master => 'cmaster', slave => 'node1');
+
+($output, $exit) = full_output(
+   sub { pt_online_schema_change::main(
+      "$master_dsn,D=pt_osc,t=city",
+      qw(--print --execute --alter-foreign-keys-method drop_swap),
+      '--alter', 'DROP COLUMN last_update'
+   )},
+   stderr => 1,
+);
+
+my $rows = $node1->selectrow_hashref("SHOW SLAVE STATUS");
+is(
+   $rows->{last_error},
+   "",
+   "Alter table with foreign keys on master replicating to cluster"
+) or diag(Dumper($rows), $output);
+
+is(
+   $exit,
+   0,
+   "... exit 0"
+) or diag($output);
+
+$sb->stop_sandbox(qw(cmaster));
+$node1->do("STOP SLAVE");
+$node1->do("RESET SLAVE");
+
+# #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($node1);

=== modified file 't/pt-table-checksum/pxc.t'
--- t/pt-table-checksum/pxc.t	2013-03-02 02:02:13 +0000
+++ t/pt-table-checksum/pxc.t	2013-03-08 21:04:28 +0000
@@ -183,7 +183,7 @@
    server => 'cslave1',
    type   => 'slave',
    master => 'node1',
-   env    => q/BINLOG_FORMAT="ROW"/,
+   env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
 # Add the slave to the DSN table.
@@ -214,7 +214,7 @@
 
 like(
    $output,
-   qr/replica h=127.1,P=12348 has binlog_format ROW/,
+   qr/replica h=127.1,P=12348 has binlog_format ROW/i,
    "--check-binlog-format warns about slave's binlog format"
 );
 
@@ -251,7 +251,7 @@
    server => 'cslave1',
    type   => 'slave',
    master => 'node2',
-   env    => q/BINLOG_FORMAT="ROW"/,
+   env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
 # Wait for the slave to apply the binlogs from node2 (its master).
@@ -291,28 +291,46 @@
 # master -> node1 in cluster, run on master
 # #############################################################################
 
+# CAREFUL: The master and the cluster are different, so don't do stuff
+# on the master that will conflict with stuff already done on the cluster.
+# And since we're using RBR, we have to do a lot of stuff on the master
+# again, manually, because REPLACE and INSERT IGNORE don't work in RBR
+# like they do SBR.
+
 my ($master_dbh, $master_dsn) = $sb->start_sandbox(
    server => 'cmaster',
    type   => 'master',
-   env    => q/BINLOG_FORMAT="ROW"/,
+   env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
-# CAREFUL: The master and the cluster are different, so we must load dbs on
-# the master then flush the logs, else node1 will apply the master's binlogs
-# and blow up because it already had these dbs.
-
-# Remember: this DSN table only has node2 and node3 (12346 and 12347) which is
-# sufficient for this test.
-$sb->load_file('cmaster', "$sample/dsn-table.sql");
+# Since master is new, node1 shouldn't have binlog to replay.
+$sb->set_as_slave('node1', 'cmaster');
 
 # We have to load a-z-cluster.sql else the pk id won'ts match because nodes use
 # auto-inc offsets but the master doesn't.
-$sb->load_file('cmaster', "$sample/a-z-cluster.sql");
-
-$master_dbh->do("FLUSH LOGS");
-$master_dbh->do("RESET MASTER");
-
-$sb->set_as_slave('node1', 'cmaster');
+$sb->load_file('cmaster', "$sample/a-z-cluster.sql", undef, no_wait => 1);
+
+# Do this stuff manually and only on the master because node1/the cluster
+# already has it, and due to RBR, we can't do it other ways.
+$master_dbh->do("SET sql_log_bin=0");
+
+# This DSN table does not include 12345 (node1/slave) intentionally,
+# so a later test can auto-find 12345 then warn "Diffs will only be
+# detected if the cluster is consistent with h=127.1,P=12345...".
+$master_dbh->do("CREATE DATABASE dsns");
+$master_dbh->do("CREATE TABLE dsns.dsns (
+  id int auto_increment primary key,
+  parent_id int default null,
+  dsn varchar(255) not null
+)");
+$master_dbh->do("INSERT INTO dsns.dsns VALUES
+  (2, 1,    'h=127.1,P=12346,u=msandbox,p=msandbox'),
+  (3, 2,    'h=127.1,P=12347,u=msandbox,p=msandbox')");
+
+$master_dbh->do("INSERT INTO percona_test.sentinel (id, ping) VALUES (1, '')");
+$master_dbh->do("SET sql_log_bin=1");
+
+$sb->wait_for_slaves(master => 'cmaster', slave => 'node1');
 
 # Notice: no --recursion-method=dsn yet.  Since node1 is a traditional slave
 # of the master, ptc should auto-detect it, which we'll test later by making

=== modified file 'util/make-barebones'
--- util/make-barebones	2012-10-16 15:58:29 +0000
+++ util/make-barebones	2013-03-08 21:04:28 +0000
@@ -8,9 +8,18 @@
 set -x
 
 tarball="$1"
-version=$(echo $tarball | awk -F'-' '{print $2}')
 full_dir=${tarball%".tar.gz"}
 
+APP="${FORK:-"mysql"}"
+if [ $APP = "mysql" ]; then
+   version=$(echo $tarball | awk -F'-' '{print $2}')
+elif [ $APP = "pxc" ]; then
+   version=$(echo $tarball | awk -F'-' '{print $4}')
+else
+   echo "Invalid FORK=$APP" >&2
+   exit 1
+fi
+
 tar xvfz "$tarball" \
    --wildcards \
    "$full_dir/COPYING" \
@@ -29,7 +38,10 @@
    "$full_dir/bin/mysqldump" \
    "$full_dir/bin/mysqld" \
    "$full_dir/bin/mysqld_safe" \
-   "$full_dir/bin/safe_mysqld"
+   "$full_dir/bin/safe_mysqld" \
+   "$full_dir/lib/libgalera_smm.so" \
+   "$full_dir/bin/clustercheck" \
+   "$full_dir/bin/wsrep*"
 
 echo "This tarball was created from $tarball.  It contains only the files necessary for creating a Percona Toolkit sandbox test server." > $full_dir/README.barebones
 
@@ -40,7 +52,7 @@
    arch="i386"
 fi
 
-bare_dir="mysql-$version-$arch-barebones"
+bare_dir="$APP-$version-$arch-barebones"
 mv $full_dir $bare_dir
 tar cvfz $bare_dir.tar.gz $bare_dir
 rm -rf $bare_dir