From: Andrei Elkin Date: April 3 2011 10:07am Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3273) WL#5569 List-Archive: http://lists.mysql.com/commits/134554 Message-Id: <201104031007.p33A7eqP006679@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1027056523==" --===============1027056523== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped 3273 Andrei Elkin 2011-04-03 wl#5569 MTS Benchmarking related patch uniforms rpl_parallel to be run with arbitrary number of workers, db:s, tables, etc. TODO: to restore the final constinency check which is given out temporary while i could not find a way to leave it surrounded with a --dis/en-able* stanza. @ mysql-test/extra/rpl_tests/rpl_parallel_load.test making the load generator to be indifferent to all parameters incl the number of db:s. Have to comment out the final consistency check sinc could not find a way to hide the verified table(s) line out of the results. @ mysql-test/suite/rpl/r/rpl_parallel.result results got updated. @ mysql-test/suite/rpl/r/rpl_sequential.result results got updated. @ mysql-test/suite/rpl/t/rpl_parallel-slave.opt the test caller has to supply -mysqld=--mts-slave-parallel-workers=[:num:]. With :num: == 0 the test is equivalent to rpl_sequential. @ mysql-test/suite/rpl/t/rpl_parallel.test removed traces of the number of workers that can vary in [0 - ..] range. The test caller has to supply -mysqld=--mts-slave-parallel-workers=[:num:]. With :num: == 0 the test is equivalent to rpl_sequential. modified: mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/suite/rpl/r/rpl_parallel.result mysql-test/suite/rpl/r/rpl_sequential.result mysql-test/suite/rpl/t/rpl_parallel-slave.opt mysql-test/suite/rpl/t/rpl_parallel.test === modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test' --- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2010-12-27 18:54:41 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2011-04-03 10:07:30 +0000 @@ -6,7 +6,7 @@ # load volume parameter # -let $iter = 1000; +let $iter = 250; # windows run on PB2 is too slow to time out disable_query_log; @@ -16,7 +16,7 @@ if (`select convert(@@version_compile_os } enable_query_log; -let $databases = 4; +let $databases = 16; connection slave; @@ -259,30 +259,29 @@ select ts from test0.benchmark where sta select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile 'delta.out'; ---enable_result_log ---enable_query_log - - -let $i = $databases + 1; -while($i) -{ - let $i1 = $i; - dec $i1; - let $diff_tables=master:test$i1.v_tm_nk, slave:test$i1.v_tm_nk; - source include/diff_tables.inc; +# let $i = $databases + 1; +# while($i) +# { +# let $i1 = $i; +# dec $i1; + +# let $diff_tables=master:test$i1.v_tm_nk, slave:test$i1.v_tm_nk; +# source include/diff_tables.inc; + +# let $diff_tables=master:test$i1.v_ti_nk, slave:test$i1.v_ti_nk; +# source include/diff_tables.inc; - let $diff_tables=master:test$i1.v_ti_nk, slave:test$i1.v_ti_nk; - source include/diff_tables.inc; +# let $diff_tables=master:test$i1.v_tm_wk, slave:test$i1.v_tm_wk; +# source include/diff_tables.inc; - let $diff_tables=master:test$i1.v_tm_wk, slave:test$i1.v_tm_wk; - source include/diff_tables.inc; +# let $diff_tables=master:test$i1.v_ti_wk, slave:test$i1.v_ti_wk; +# source include/diff_tables.inc; - let $diff_tables=master:test$i1.v_ti_wk, slave:test$i1.v_ti_wk; - source include/diff_tables.inc; - - dec $i; -} +# dec $i; +# } +--enable_result_log +--enable_query_log connection master; === modified file 'mysql-test/suite/rpl/r/rpl_parallel.result' --- a/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-27 18:54:41 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel.result 2011-04-03 10:07:30 +0000 @@ -1,9 +1,5 @@ include/master-slave.inc [connection master] -set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; -select @@global.mts_slave_parallel_workers as 'non-zero means parallel'; -non-zero means parallel -4 call mtr.add_suppression('Slave: Error dropping database'); include/stop_slave.inc start slave; @@ -16,22 +12,5 @@ select ts from test0.benchmark where sta select ts from test0.benchmark where state like 'slave ends load' into @s_1; select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile 'delta.out'; -include/diff_tables.inc [master:test3.v_tm_nk, slave:test3.v_tm_nk] -include/diff_tables.inc [master:test3.v_ti_nk, slave:test3.v_ti_nk] -include/diff_tables.inc [master:test3.v_tm_wk, slave:test3.v_tm_wk] -include/diff_tables.inc [master:test3.v_ti_wk, slave:test3.v_ti_wk] -include/diff_tables.inc [master:test2.v_tm_nk, slave:test2.v_tm_nk] -include/diff_tables.inc [master:test2.v_ti_nk, slave:test2.v_ti_nk] -include/diff_tables.inc [master:test2.v_tm_wk, slave:test2.v_tm_wk] -include/diff_tables.inc [master:test2.v_ti_wk, slave:test2.v_ti_wk] -include/diff_tables.inc [master:test1.v_tm_nk, slave:test1.v_tm_nk] -include/diff_tables.inc [master:test1.v_ti_nk, slave:test1.v_ti_nk] -include/diff_tables.inc [master:test1.v_tm_wk, slave:test1.v_tm_wk] -include/diff_tables.inc [master:test1.v_ti_wk, slave:test1.v_ti_wk] -include/diff_tables.inc [master:test0.v_tm_nk, slave:test0.v_tm_nk] -include/diff_tables.inc [master:test0.v_ti_nk, slave:test0.v_ti_nk] -include/diff_tables.inc [master:test0.v_tm_wk, slave:test0.v_tm_wk] -include/diff_tables.inc [master:test0.v_ti_wk, slave:test0.v_ti_wk] set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp; -set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; include/rpl_end.inc === modified file 'mysql-test/suite/rpl/r/rpl_sequential.result' --- a/mysql-test/suite/rpl/r/rpl_sequential.result 2010-12-27 18:54:41 +0000 +++ b/mysql-test/suite/rpl/r/rpl_sequential.result 2011-04-03 10:07:30 +0000 @@ -16,21 +16,5 @@ select ts from test0.benchmark where sta select ts from test0.benchmark where state like 'slave ends load' into @s_1; select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile 'delta.out'; -include/diff_tables.inc [master:test3.v_tm_nk, slave:test3.v_tm_nk] -include/diff_tables.inc [master:test3.v_ti_nk, slave:test3.v_ti_nk] -include/diff_tables.inc [master:test3.v_tm_wk, slave:test3.v_tm_wk] -include/diff_tables.inc [master:test3.v_ti_wk, slave:test3.v_ti_wk] -include/diff_tables.inc [master:test2.v_tm_nk, slave:test2.v_tm_nk] -include/diff_tables.inc [master:test2.v_ti_nk, slave:test2.v_ti_nk] -include/diff_tables.inc [master:test2.v_tm_wk, slave:test2.v_tm_wk] -include/diff_tables.inc [master:test2.v_ti_wk, slave:test2.v_ti_wk] -include/diff_tables.inc [master:test1.v_tm_nk, slave:test1.v_tm_nk] -include/diff_tables.inc [master:test1.v_ti_nk, slave:test1.v_ti_nk] -include/diff_tables.inc [master:test1.v_tm_wk, slave:test1.v_tm_wk] -include/diff_tables.inc [master:test1.v_ti_wk, slave:test1.v_ti_wk] -include/diff_tables.inc [master:test0.v_tm_nk, slave:test0.v_tm_nk] -include/diff_tables.inc [master:test0.v_ti_nk, slave:test0.v_ti_nk] -include/diff_tables.inc [master:test0.v_tm_wk, slave:test0.v_tm_wk] -include/diff_tables.inc [master:test0.v_ti_wk, slave:test0.v_ti_wk] set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp; include/rpl_end.inc === modified file 'mysql-test/suite/rpl/t/rpl_parallel-slave.opt' --- a/mysql-test/suite/rpl/t/rpl_parallel-slave.opt 2010-12-22 19:19:17 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel-slave.opt 2011-04-03 10:07:30 +0000 @@ -1,2 +1,2 @@ ---mts-slave-parallel-workers=4 --log-warnings=0 --slave-transaction-retries=0 +--log-warnings=0 --slave-transaction-retries=0 === modified file 'mysql-test/suite/rpl/t/rpl_parallel.test' --- a/mysql-test/suite/rpl/t/rpl_parallel.test 2010-12-27 18:54:41 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel.test 2011-04-03 10:07:30 +0000 @@ -35,15 +35,7 @@ --source include/master-slave.inc -connection slave; -set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; -select @@global.mts_slave_parallel_workers as 'non-zero means parallel'; -let $workers = `select @@global.mts_slave_parallel_workers`; - connection master; source extra/rpl_tests/rpl_parallel_load.test; -connection slave; -set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; - --source include/rpl_end.inc --===============1027056523== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: dc0ccdc4525d69e2a43068835556587857d735ff # timestamp: 2011-04-03 13:07:40 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # 65e12tpteebi39g3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX5dEYkABOhfgEAQXH///3ZC jIq////6YAovvW7bsAAACEaANtkiFCgBhKIo9Gk1Mhs0jSbUbU2oG1PSAA0ANBqU3pT1NPIQ00aa YgANDEBkAADmATATIwAjExMJhMENMTTASJEU9PU00TKNNP0mSP0ImBDQ0GmjI00OYBMBMjACMTEw mEwQ0xNMBJECACYmhMgTTTFCeoeoNAaaD1NdKG9yTQKZ6otrAZ6fxJSKKZr+JDawGLBXD1iUF7PL CnVDAWU8KeEuDEmEQRi9spw4VW10pQp9o7/w6JHbJI3eKXbDinjp7X5nLgiwJgxttDaTeI/fciza fSJfKI3ElpXKDcvavnGkJUhGvudq3CwruhBiLOFFvMHizmGV033aXo3UUmeRSZMgz4H0W55DEN5k SQd1MoNWCCOcjBAaWaSBdoYT3DBKSCgpSxNkTa5gvz7YVyFZAhlmGIfWRfbJ6BWIrhCy7Q5kc55T jHlIrJZ2mOLjMb4RuwtMtOYqYVKu4hYYD3n1IR1lejSIX1EjlSV/tS+DuAYetvdbxSnBeDgxUItM GP0g47MzWirTL9V+okSl5HJdvjuT12Wi3nFi88EcfKgqjToJW9YFlSU/llAvJ8J/QxuKYjU/CiSN UenUQSCKJiKAwM3ACxHDhNBTGhAH782dpNBrohM6fo1oHiwkX+Yk/SAhePVCB0HInBUUiBIZQEmU ZxQEbiJQ0f5HISpOhAFUfgNBKjTHGhAqKi2h411WeBb3rFBJhVOP0tkrwwFkKQHs4leCPa8tQE9j g8MSiAwZOrRTp0nNFFb29i4k/HjnIsYZZWJ7dkvztGRpMW+WVV7riL2NsieRLAGFrAWG6UzyzkHf xJFd1fA5HOeCKEuBy6chy03QxZaf8WhVC8tba53cmaJkIN1BjD2YpWUUL041CxHDbkQB62K3nFzg VlYXkZFrmMCnHKAFlhMtCJky+YvQwuayhiJUiixQEwk03UVAjhvyGlQpozrkViwDr20h6CWGh0Wc qcg0LTtxUN+R393bO/XfE2Ocd0A15NL14EAnscaTpkUcuDwl0b0kjUatd1w5AU8s4F1qLjsL5rxN L+utDkWXFxsdXB88E+Qoi6l99VRRw2J1bA5ufHUIeIx3ampdkWlSGIhDSg50XGw+Qp0CoVj0hx0z uLSrj1JGZMtOalIxOU6yJQ4TSlwY2LyBoKBWd5ueorDxDXdGLs9vIiORj0IAWhu7GQlRLIiLiVOj Ic15mqNp3MzZxSyOwoD8yhdZ1+5yM6K7RsjJ9LRoFDXg0HJtpAgEJECohYUwYiT0q4cC4gSuvLYC V2ExjDa42HtFNhNQgFWAo0NTxF3WwRn2qfleXsTLh5mZBe5+lJTRlIe1FYZQgcUYUaqFGFAU51zn HQ9x6kpIepiy9ojak5CoBbt4G227Lp1epUeOm7aFUZugTOcZhdW2MbfMjVIbY22BeVjFx/ZF/Eiw QbMlGDSZ3vXLHJ9/gS8Gp5zqoaMSLWiEMDYj05hwkjRuqDPNLeEmcgDP8BZibuXRhrW3IlQv35Iw 2YhjvUBjxMEXTjmvyZBH4ZJHH8hb0+D3NTcKCqAiLfoYpXFDVEOVSSLD7iqRDKL0XochMh/0ilPt eArWQsLsKHQ6kkO3qU73HRCdW/+6AoH4q7XccR0mQaY6+EuNJOTFkQ4wlg8ykEwE4QeiEodfIkew I8te/qzMwNwNyNS2NpHobmpQmcWuCBjibLc1CBgfbb00teseNCMIJIYPZJErWHQxoS7+YUPBiNkG DFDEEb6nP15wyFWdxgXJWqLVpQ5GBUkTP9HU4FjjF2JTiEy3P1CwLBR9/cP3kEgs9BLvFLXNH0G+ Yb+0VY0GDy4yhReKaCwdJDoZEgiHPz9FTsMj0sl3OsSnpUcV5H7sg+iPojjTNkPoIzAiGEPKS1MT ImNTuvnAVMfWCg2mrbpBzZGKS0pNt/7PJE7BA6ey/x94Xbb0qGF6BWnSl9A+ZXQ8FtpFF3dUFseo fJonS1HRgbMVEhNmZjQpgZZyQW1JGjyoV4IznItozi2GogqvkAKzl0DSSQsGokAHigWoauhBUMiB QKPLmh/vzJm33FwWIfIk4lbsyhMSqEHZMj3E+kFWTS7GHsDLWdehkW2qaDr58cQIGgdId6ggJIa2 JvpdmxHU0icaqq+ZJRvTRWMAqMe+zCCBp+IRRAiA/WeV0iz+vhxnykigr62S8i5Z/P4AlHvA37vu N099lzKH5fBaiVwqxLAPMXitYs0aKiU2/RkCWQKJBrAnTgGTx8dm6BoZUmDTbR0gwwq3wLMxVlGe TRYIB1gspQ1WnuS4R5UkNJabkkbwypBrmJzRHco++QQRU0CunxRvNREXotdXhULI+BIiDahn9P5B 0U1UjwmLaDQrMIyE+NTH1LZCglWp0setcRkSEDMaIZE5OhhhE2+8RA82lU4Rb6qFL5I2DvLd42lq AtZLAJqCyGn8apHkKKIQE4uQohhUiXCgVSDsgzir6U7RQU80kMDS8AuDEic15nqapSLfMM135k16 Qki3vMCqw7loMIIcmQyTMjcXUrLRX4iQQINXMmqUA4KQl0xQmBdJXlv2JLowVqaSVAFwy3RIlOeA Q9Ug4IqypRCh0ERHzftAUwzue4uCxgaMtbswr/N2ZrnhuIIhwOKyZKY5zUsSKY1nTUrPeRkTJq9X F8NnmfV44TTM4UeKyFCPWI4S7cxQ4JV2ngOLjFGdwFcEWHJkTXimKAbo9kK8QEGLLwtuAiuQXg6F Qi3wQApkNxHOdlrjqJHEbZgHTJlH+d5HAYKCseaJiHCBeUAgfRXy7LAKmCCvvqZ09jS1cK4hWZgM tUVocvJCIaGwlaF6JJVsnzqDMN5mHlb4lAsSLhW0QWL+K1J548J5lXYd84pT2EruQlwisaw+AgWA OdQ4nnFCuSvjmopwxHdfIS5gfYLimYlOFijoBMXEXAMxOdwl7C34VkWQwlzDh1nL5ubGK8xLIS8s TImtRtBiglBXoVhj+1CnyLi/iV6FyI1dVupvn+LuSKcKEg/LojEg --===============1027056523==--