Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1086018-pt-config-diff-wsrep_provider_options into lp:percona-toolkit/2.2

[Brian Fraser]

[Brian Fraser (fraserbn)]

review: Approve

[Daniel Nichter (daniel-nichter)]

103 -version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2`;
104 +version="5.5"

That doesn't look correct?

No test case?

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/fix-1086018-pt-config-diff-wsrep_provider_options]

548. By Brian Fraser on 2013-03-06

Revert a debugging change to start-sandbox that should've never been commited

549. By Brian Fraser on 2013-03-06

Add missing test files

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff	2013-03-04 17:28:43 +0000
+++ bin/pt-config-diff	2013-03-06 21:15:27 +0000
@@ -2784,9 +2784,33 @@
       die "Unknown config source";
    }
 
+   handle_special_vars(\%config_data);
+   
    return %config_data;
 }
 
+sub handle_special_vars {
+   my ($config_data) = @_;
+   
+   if ( $config_data->{vars}->{wsrep_provider_options} ) {
+      my $vars  = $config_data->{vars};
+      my $dupes = $config_data->{duplicate_vars};
+      for my $wpo ( $vars->{wsrep_provider_options}, @{$dupes->{wsrep_provider_options} || [] } ) {
+         my %opts = $wpo =~ /(\S+)\s*=\s*(\S*)(?:;|;?$)/g;
+         while ( my ($var, $val) = each %opts ) {
+            $val =~ s/;$//;
+            if ( exists $vars->{$var} ) {
+               push @{$dupes->{$var} ||= []}, $val;
+            }
+            $vars->{$var} = $val;
+         }
+      }
+      delete $vars->{wsrep_provider_options};
+   }
+
+   return;
+}
+
 sub _parse_config_output {
    my ( %args ) = @_;
    my @required_args = qw(output TextResultSetParser);
@@ -2829,7 +2853,7 @@
          vars   => $vars,
       );
    }
-
+   
    return (
       format         => $format,
       vars           => $vars,

=== modified file 'lib/MySQLConfig.pm'
--- lib/MySQLConfig.pm	2013-01-03 00:19:16 +0000
+++ lib/MySQLConfig.pm	2013-03-06 21:15:27 +0000
@@ -121,9 +121,34 @@
       die "Unknown config source";
    }
 
+   handle_special_vars(\%config_data);
+   
    return %config_data;
 }
 
+sub handle_special_vars {
+   my ($config_data) = @_;
+   
+   if ( $config_data->{vars}->{wsrep_provider_options} ) {
+      my $vars  = $config_data->{vars};
+      my $dupes = $config_data->{duplicate_vars};
+      for my $wpo ( $vars->{wsrep_provider_options}, @{$dupes->{wsrep_provider_options} || [] } ) {
+         my %opts = $wpo =~ /(\S+)\s*=\s*(\S*)(?:;|;?$)/g;
+         while ( my ($var, $val) = each %opts ) {
+            $val =~ s/;$//;
+            if ( exists $vars->{$var} ) {
+               push @{$dupes->{$var} ||= []}, $val;
+            }
+            $vars->{$var} = $val;
+         }
+      }
+      # Delete from vars, but not from dupes, since we still want that
+      delete $vars->{wsrep_provider_options};
+   }
+
+   return;
+}
+
 sub _parse_config_output {
    my ( %args ) = @_;
    my @required_args = qw(output TextResultSetParser);
@@ -166,7 +191,7 @@
          vars   => $vars,
       );
    }
-
+   
    return (
       format         => $format,
       vars           => $vars,

=== added file 't/pt-config-diff/pxc.t'
--- t/pt-config-diff/pxc.t	1970-01-01 00:00:00 +0000
+++ t/pt-config-diff/pxc.t	2013-03-06 21:15:27 +0000
@@ -0,0 +1,65 @@
+#!/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 English qw(-no_match_vars);
+use Test::More;
+use Data::Dumper;
+
+# Hostnames make testing less accurate.  Tests need to see
+# that such-and-such happened on specific slave hosts, but
+# the sandbox servers are all on one host so all slaves have
+# the same hostname.
+$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-config-diff";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $node1 = $sb->get_dbh_for('node1');
+my $node2 = $sb->get_dbh_for('node2');
+my $node3 = $sb->get_dbh_for('node3');
+
+if ( !$node1 ) {
+   plan skip_all => 'Cannot connect to cluster node1';
+}
+elsif ( !$node2 ) {
+   plan skip_all => 'Cannot connect to cluster node2';
+}
+elsif ( !$node3 ) {
+   plan skip_all => 'Cannot connect to cluster node3';
+}
+elsif ( !$sb->is_cluster_mode ) {
+   plan skip_all => "PXC tests";
+}
+
+my $node1_dsn = $sb->dsn_for('node1');
+my $node2_dsn = $sb->dsn_for('node2');
+
+my $output = output(sub { pt_config_diff::main($node1_dsn, $node2_dsn) });
+
+like(
+   $output,
+   qr/gcache.dir .+\ngcache.name/,
+   "pt-config-diff parses & detects differences in each member of wsrep_provider_options"
+);
+
+$output = output(sub { pt_config_diff::main($node1_dsn, "$trunk/t/pt-config-diff/samples/pxc.cnf") });
+
+like(
+   $output,
+   qr/pc.ignore_sb\s*false\s*true/,
+   "wsrep_provider_options, node vs config file"
+);
+
+
+
+done_testing;

=== added file 't/pt-config-diff/samples/pxc.cnf'
--- t/pt-config-diff/samples/pxc.cnf	1970-01-01 00:00:00 +0000
+++ t/pt-config-diff/samples/pxc.cnf	2013-03-06 21:15:27 +0000
@@ -0,0 +1,42 @@
+[client]
+user     = msandbox
+password = msandbox
+port     = 12345
+socket   = /tmp/12345/mysql_sandbox12345.sock
+
+[mysqld]
+port                       = 12345
+socket                     = /tmp/12345/mysql_sandbox12345.sock
+pid-file                   = /tmp/12345/data/mysql_sandbox12345.pid
+basedir                    = /home/hugmeir/mysql/Percona-XtraDB-Cluster-5.5.28-23.7.373.Linux.x86_64/
+datadir                    = /tmp/12345/data
+key_buffer_size            = 16M
+innodb_buffer_pool_size    = 16M
+innodb_data_home_dir       = /tmp/12345/data
+innodb_log_group_home_dir  = /tmp/12345/data
+innodb_data_file_path      = ibdata1:10M:autoextend
+innodb_log_file_size       = 5M
+log-bin                    = mysql-bin
+relay_log                  = mysql-relay-bin
+log_slave_updates
+server-id                  = 12345
+report-host                = 127.0.0.1
+report-port                = 12345
+log-error                  = /tmp/12345/data/mysqld.log
+innodb_lock_wait_timeout   = 3
+general_log
+general_log_file           = genlog
+
+binlog_format              = ROW
+wsrep_provider             = /home/hugmeir/mysql/Percona-XtraDB-Cluster-5.5.28-23.7.373.Linux.x86_64//lib/libgalera_smm.so
+wsrep_cluster_address      = gcomm://192.168.1.34:12356
+wsrep_sst_receive_address  = 192.168.1.34:12365
+wsrep_node_incoming_address= 192.168.1.34
+wsrep_slave_threads        = 2
+wsrep_cluster_name         = pt_sandbox_cluster
+wsrep_provider_options     = "gmcast.listen_addr=tcp://192.168.1.34:12355; pc.ignore_sb = true;"
+wsrep_sst_method           = rsync
+wsrep_node_name            = 12345
+innodb_locks_unsafe_for_binlog = 1
+innodb_autoinc_lock_mode   = 2
+wsrep-replicate-myisam