← Back to team overview

maria-developers team mailing list archive

Re: Fwd: [Commits] Rev 3897: bzr merge -r4123..4144 codership/5.6 in lp:~maria-captains/maria/maria-10.0-galera

 

Hello,

Thanks for taking the time to review this. Your concerns are spot-on.

== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl      2014-09-29 00:43:56 +0000
+++ b/mysql-test/mysql-test-run.pl      2014-09-30 22:06:15 +0000
@@ -3189,6 +3189,9 @@
    mtr_report(" - adding wsrep, galera to default test suites");
    push @DEFAULT_SUITES, qw(wsrep galera);

+    # ADD scripts to $PATH to that wsrep_sst_* can be found
+    $ENV{'PATH'} = $ENV{'PATH'}.':'.$basedir.'/
scripts';

Is this the right place to do this ? Serg already commented about the fact that we should not "temper" mtr globally, instead only when galera tests are run, I just wonder because at scripts directory contain other than wsrep scripts, does this affect existing tests...

Yes, you are right, I reverted this change and moved it into suite/galera/galera2nodes.cnf, which now looks like this:

[ENV]
PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:@ENV.MYSQL_BINDIR/scripts

Unfortunately, in the context of .cnf files, MTR does not allow to simply append to the existing $PATH, so I have to reinitialize it from scratch.


=== modified file 'mysql-test/suite/galera/
galera_2nodes.cnf'
--- a/mysql-test/suite/galera/galera_2nodes.cnf 2014-08-26 20:23:56 +0000
+++ b/mysql-test/suite/galera/galera_2nodes.cnf 2014-09-30 22:06:15 +0000
@@ -2,22 +2,36 @@
!include include/default_mysqld.cnf

[mysqld.1]
+innodb_file_per_table
binlog-format=row
+innodb_file_format=Barracuda
+performance_schema=OFF
+
wsrep_provider=@ENV.WSREP_PROVIDER
wsrep_cluster_address='gcomm://'
wsrep_provider_options='base_port=@mysqld.1.#galera_port'
wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
# enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON
+wsrep_sync_wait = 7
+wsrep_node_address=127.0.0.1
+wsrep_node_incoming_address=127.0.0.1

Why we need to have innodb_file_per_table=1, innodb_file_format=Barracuda and performance_schema=OFF ?

I have removed those options. performance_schema was OFF because there was an assertion that affected all the tests.

Secondly, why wsrep_sync_wait=7 (can't these different numbers have more meaningful values i.e. enum ?)

This is required to ensure that all statements see the latest state of the database, allowing for deterministic tests. With respect to using a bitmask vs. an enum, please feel free to open an issue in LaunchPad.

Philip Stoev