Merge pull request #295 from percona/PT-244

PT-244 Fixed --data-dir with partitions

bin/pt-online-schema-change

@@ -56,7 +56,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.6';
+our $VERSION = '3.0.7';
 
 use strict;
 use warnings FATAL => 'all';
@@ -10393,15 +10393,15 @@ sub create_new_table {
       }
       if ( $o->get('data-dir') && !$o->got('remove-data-dir') ) {
           if ( (-d $o->get('data-dir')) && (-w $o->get('data-dir')) ){
-             $sql =~ s/DATA DIRECTORY='.*?'//; 
-             $sql .= sprintf(" DATA DIRECTORY='%s' ",$o->get('data-dir'));
+             $sql = insert_data_directory($sql, $o->get('data-dir'));
              PTDEBUG && _d("adding data dir ".$o->get('data-dir'));
+             PTDEBUG && _d("New query\n$sql\n");
           } else {
               die $o->get('data-dir') . " is not a directory or it is not writable";
           }
       }
       if ( $o->got('remove-data-dir') ) {
-         $sql =~ s/DATA DIRECTORY='.*?'//; 
+         $sql =~ s/DATA DIRECTORY\s*=\s*'.*?'//; 
          PTDEBUG && _d("removing data dir");
       }
       PTDEBUG && _d($sql);
@@ -10440,6 +10440,21 @@ sub create_new_table {
      . "no longer need, then re-run the tool.\n";
 }
 
+sub insert_data_directory {
+    my ($sql, $data_dir) = @_;
+    $sql =~ s/DATA DIRECTORY\s*=\s*'.*?'//; 
+
+    my $re_ps=qr/(\/\*!50100 )?(PARTITION|SUBPARTITION)/;
+    
+    if ($sql=~ m/$re_ps/) {
+        my $insert_pos=$-[0];
+        $sql = substr($sql, 0, $insert_pos - 1). " DATA DIRECTORY = '$data_dir' " .substr($sql, $insert_pos);
+    } else {
+        $sql .= " DATA DIRECTORY = '$data_dir' ";
+    }
+    return $sql;
+}
+
 sub swap_tables {
    my (%args) = @_;
    my @required_args = qw(orig_tbl new_tbl Cxn Quoter OptionParser Retry tries stats);

docs/release_notes.rst

@@ -1,7 +1,7 @@
 Release Notes
 *************
 
-v3.0.6 released 2018-12-04
+v3.0.6 released 2018-01-04
 ==========================
 
 Percona Toolkit 3.0.6 includes the following changes:
@@ -10,16 +10,24 @@ New Features
 
 * :jirabug:`PT-221`: Improve ``pt-table-sync`` support for ``MyRocks``
 * :jirabug:`PT-218`: ``pt-stalk`` now checks the ``RocksDB`` status
-* :jirabug:`PT-214`:  ``pt-mysql-summary`` contains the ``RocksDB`` section
-* :jirabug:`PT-205`: ``pt-osc`` shows a message if trying to set the engine to ``rocksdb`` and ``binlog_format != row``
-* :jirabug:`PT-204`: ``pt-table-checksum`` skips ``RocksDB`` tables
+* :jirabug:`PT-214`: ``pt-mysql-summary`` contains the ``RocksDB`` section
+* :jirabug:`PT-205`: ``pt-osc`` shows a message if trying to set the engine to
+  ``rocksdb`` and ``binlog_format != row``.
+* :jirabug:`PT-204`: ``pt-table-checksum`` skips ``RocksDB`` tables.
 
-Bug fixes
+Known Issues
 
-* :jirabug:`PT-234`: The genaral log parser cannot handle timestamps which include time zones
+* :jirabug:`PT-238`: The information message implemented for :jirabug:`PT-204` has a typo when referring to the ``--ignore-engines`` parameter. This problem is planned to be fixed in the next release.
+* :jirabug:`PT-240`: It has been detected that the implementation of :jirabug:`PT-205` is not complete and ``pt-osc`` may fail when altering tables. This problem is planned to be fixed in the next release.
+
+Bug Fixes
+
+* :jirabug:`PT-234`: The general log parser cannot handle timestamps which include time zones
 * :jirabug:`PT-229`: ``pt-online-schema-change`` does not retry on a deadlock error when using ``Percona Server`` 5.7
 * :jirabug:`PT-225`: ``pt-table-checksum`` ignores generated columns
 
+
+
 v3.0.5 released 2017-11-20
 ==========================
 

t/pt-online-schema-change/pt-244.t

@@ -0,0 +1,109 @@
+#!/usr/bin/env perl
+
+BEGIN {
+    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+    unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+    unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use threads;
+use threads::shared;
+use Thread::Semaphore;
+
+use English qw(-no_match_vars);
+use Test::More;
+
+use Data::Dumper;
+use PerconaTest;
+use Sandbox;
+use SqlModes;
+use File::Temp qw/ tempdir /;
+
+plan tests => 4;
+
+require "$trunk/bin/pt-online-schema-change";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+
+my $master3_port   = 2900;
+my $master_basedir = "/tmp/$master3_port";
+
+diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox master $master3_port >/dev/null`);
+
+my $dbh3 = $sb->get_dbh_for("master3");
+my $dsn3 = $sb->dsn_for("master3");
+
+if ( !$dbh3 ) {
+    plan skip_all => 'Cannot connect to sandbox master';
+}
+
+# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
+# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the
+# tool will die.
+my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
+my $output;
+my $exit_status;
+
+diag("1");
+$sb->load_file('master3', "t/pt-online-schema-change/samples/pt-244.sql");
+
+my $num_rows = 1000;
+diag("Loading $num_rows into the table. This might take some time.");
+diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master3_port --user=msandbox --password=msandbox test t3 $num_rows`);
+diag("$num_rows rows loaded. Starting tests.");
+
+$dbh3->do("FLUSH TABLES");
+
+my $new_dir='/tmp/tdir';
+diag(`rm -rf $new_dir`);
+diag(`mkdir $new_dir`);
+
+diag("2");
+($output, $exit_status) = full_output(
+    sub { pt_online_schema_change::main(@args, "$dsn3,D=test,t=t3",
+            '--execute', 
+            '--alter', "engine=innodb",
+            '--data-dir', $new_dir,
+        ),
+    },
+    stderr => 1,
+);
+diag("3");
+
+is(
+    $exit_status,
+    0,
+    "PT-244 Successfully altered. Exit status = 0",
+);
+
+like(
+    $output,
+    qr/Successfully altered/s,
+    "PT-244 Got successfully altered message.",
+);
+
+
+my $db_dir="$new_dir/test/";
+opendir(my $dh, $db_dir) || die "Can't opendir $db_dir: $!";
+my @files = grep { /^t3#P#p/  } readdir($dh);
+closedir $dh;
+
+is(
+    scalar @files,
+    4,
+    "PT-224 Number of files is correct",
+);
+
+$dbh3->do("DROP DATABASE IF EXISTS test");
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($dbh3);
+diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;

t/pt-online-schema-change/samples/pt-244.sql

@@ -0,0 +1,10 @@
+DROP DATABASE IF EXISTS test;
+CREATE DATABASE test;
+USE test;
+
+
+CREATE TABLE t3 (
+    c INT PRIMARY KEY AUTO_INCREMENT
+) ENGINE=InnoDB PARTITION BY HASH(c) PARTITIONS 4;
+
+INSERT INTO t3 VALUES (1), (2), (3), (4), (5);