From: Frazer Clement Date: June 16 2011 12:36pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (frazer.clement:4459) List-Archive: http://lists.mysql.com/commits/139331 Message-Id: <201106161236.p5GCaZ91009009@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2318795399835260673==" --===============2318795399835260673== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/frazer/bzr/mysql-5.1-telco-7.0/ based on revid:ole.john.aske@stripped 4459 Frazer Clement 2011-06-16 Modify 2 channel circular replication testcase to use IGNORE_SERVER_IDS The 2 channel circular replication testcase uses the same server id for both MySQLDs on each site to avoid double application of 'reflected' events. This is not necessary with the IGNORE_SERVER_IDs CHANGE MASTER option, so the testcase is modified to use distinct server ids + IGNORE_SERVER_IDS. added: mysql-test/suite/ndb_rpl/ndb_master-slave_2ch_end.inc modified: mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test === modified file 'mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc' --- a/mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc 2011-05-13 07:40:50 +0000 +++ b/mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc 2011-06-16 12:36:28 +0000 @@ -3,10 +3,11 @@ # Set up circular cluster replication where each # cluster has two mysqlds and replication directions are # following: +# 1 2 # master ---> slave # / \ # cluster A cluster B -# \ / +# \ 3 4 / # master1 <--- slave1 # # ==== Usage ==== @@ -26,8 +27,9 @@ # $rpl_skip_start_slave, $rpl_debug, $slave_timeout # See include/master-slave.inc +#--let $rpl_debug= 1 --let $rpl_topology= 1->2,4->3 ---let $rpl_skip_check_server_ids= 1 +--let $rpl_skip_start_slave= 1 --source include/rpl_init.inc # Make connections to mysqlds @@ -37,7 +39,7 @@ --source include/rpl_connect.inc --let $rpl_connection_name= master1 ---let $rpl_server_number= 1 +--let $rpl_server_number= 3 --source include/rpl_connect.inc --let $rpl_connection_name= slave @@ -45,9 +47,23 @@ --source include/rpl_connect.inc --let $rpl_connection_name= slave1 ---let $rpl_server_number= 2 +--let $rpl_server_number= 4 --source include/rpl_connect.inc +# Now add IGNORE_SERVER_IDS +--disable_query_log +connection master; +CHANGE MASTER TO IGNORE_SERVER_IDS= (1,3); +connection master1; +CHANGE MASTER TO IGNORE_SERVER_IDS= (1,3); +connection slave; +CHANGE MASTER TO IGNORE_SERVER_IDS= (2,4); +connection slave1; +CHANGE MASTER TO IGNORE_SERVER_IDS= (2,4); + +# Now start replication +--source include/rpl_start_slaves.inc +--enable_query_log # Check that all mysqld are compiled with ndb support --let $_rpl_server= 4 === added file 'mysql-test/suite/ndb_rpl/ndb_master-slave_2ch_end.inc' --- a/mysql-test/suite/ndb_rpl/ndb_master-slave_2ch_end.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb_rpl/ndb_master-slave_2ch_end.inc 2011-06-16 12:36:28 +0000 @@ -0,0 +1,28 @@ +# ==== Purpose ==== +# +# Clean up replication configuration after using a 2ch +# setup. +# We need to explicitly reset the IGNORE_SERVER_IDS parameters +# on all Servers to avoid testcase check errors. +# +# ==== Usage ==== +# +# [--let $rpl_debug= 1] +# --source suite/ndb_rpl/ndb_master-slave_2ch_end.inc +# +# Parameters: +# $rpl_debug +# See include/master-slave.inc + +--source include/rpl_stop_slaves.inc +--connection master +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +--connection master1 +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +--connection slave +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +--connection slave1 +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +--source include/rpl_start_slaves.inc + +--source include/rpl_end.inc \ No newline at end of file === modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result' --- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result 2011-05-13 07:40:50 +0000 +++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result 2011-06-16 12:36:28 +0000 @@ -3,6 +3,7 @@ include/rpl_connect.inc [creating master include/rpl_connect.inc [creating master1] include/rpl_connect.inc [creating slave] include/rpl_connect.inc [creating slave1] +include/rpl_start_slaves.inc *** Check server_id of mysqld servers *** SHOW VARIABLES LIKE "server_id"; @@ -12,7 +13,7 @@ SET auto_increment_offset = 1; SET auto_increment_increment = 2; SHOW VARIABLES LIKE "server_id"; Variable_name Value -server_id 1 +server_id 3 SET auto_increment_offset = 1; SET auto_increment_increment = 2; SHOW VARIABLES LIKE "server_id"; @@ -22,7 +23,7 @@ SET auto_increment_offset = 2; SET auto_increment_increment = 2; SHOW VARIABLES LIKE "server_id"; Variable_name Value -server_id 2 +server_id 4 SET auto_increment_offset = 2; SET auto_increment_increment = 2; @@ -48,4 +49,10 @@ Check data on both clusters include/diff_tables.inc [master:t1, slave:t1] DROP TABLE IF EXISTS t1; +include/rpl_stop_slaves.inc +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +CHANGE MASTER TO IGNORE_SERVER_IDS= (); +include/rpl_start_slaves.inc include/rpl_end.inc === modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf' --- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf 2011-05-13 07:40:50 +0000 +++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf 2011-06-16 12:36:28 +0000 @@ -2,34 +2,39 @@ # 2 clusters, each with 2 MySQLDs # All MySQLDs log-slave-updates -# Potential infinite loops are broken by both servers -# on each cluster having the same server-id -# To support > 2 clusters and/or different server-ids per -# MySQLD server, we need some other loop breaking -# mechanism +# All MySQLDs log-apply-status +# Infinite loops broken in the test using Ignore_server_ids mechanism [mysqld.1.1] server-id= 1 log-bin +ndb_connectstring= @mysql_cluster.1.ndb_connectstring log-slave-updates +skip-slave-start [mysqld.2.1] -server-id= 1 +server-id= 3 log-bin +ndb_connectstring= @mysql_cluster.1.ndb_connectstring log-slave-updates +skip-slave-start [mysqld.1.slave] server-id= 2 log-bin +ndb_connectstring= @mysql_cluster.slave.ndb_connectstring log-slave-updates skip-slave-start [mysqld.2.slave] -server-id= 2 +server-id= 4 log-bin ndb_connectstring= @mysql_cluster.slave.ndb_connectstring +log-slave-updates +skip-slave-start [ENV] - -SLAVE_MYPORT1= @mysqld.2.slave.port -SLAVE_MYSOCK1= @mysqld.2.slave.socket +SERVER_MYPORT_1= @mysqld.1.1.port +SERVER_MYPORT_2= @mysqld.1.slave.port +SERVER_MYPORT_3= @mysqld.2.1.port +SERVER_MYPORT_4= @mysqld.2.slave.port === modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test' --- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test 2011-05-13 07:40:50 +0000 +++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test 2011-06-16 12:36:28 +0000 @@ -163,5 +163,8 @@ DROP TABLE IF EXISTS t1; --source include/wait_for_query_to_fail.inc --echo +--connection master + # End of test 5.1 ---source include/rpl_end.inc +--source suite/ndb_rpl/ndb_master-slave_2ch_end.inc + --===============2318795399835260673== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/frazer.clement@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: frazer.clement@stripped\ # xf58sgunjc3i2i3m # target_branch: file:///home/frazer/bzr/mysql-5.1-telco-7.0/ # testament_sha1: 1e4c9ebde812861889509aba495878f92309e1c2 # timestamp: 2011-06-16 13:36:32 +0100 # base_revision_id: ole.john.aske@stripped\ # djarhihcuygdjde1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfYxHqIABUdfgGywXO///3/n /66////wYArHPps+XIAACYTUUDbKDRQm1GjDSZJommgTRhPUx6RGQYjIA0YmARoyMjHMJoDQGjRh GgxGmJkxNBhGgZAMmBzCaA0Bo0YRoMRpiZMTQYRoGQDJgJERNJiJppTz0KntJ6oZMTJ6nqeUBkZA aAADCKKJqbRqYp6eplPTUPUPSGTJpoAGQABg1DQJJAmhME000TAIamEh6mjUaNGjagAAyaNAeAGE GWH7qmNkjxocYiFfK615SIqJqlIthLigDsXz9Jt+NTgkP9KqM1UD7B1ZatlUxX5HnJAvU+7BCUJr KMvWbG0TYZxbpul+918afq7ZJbOK0FmhKmbIA5sLBxjeasuy+tqPW7EkzSTbS50pjeWuuqtDFnx5 0hbqavcCUUPyY1I/xEFRTGz3ozDsDAzCGZDDC3zPAC+OOPRSojVdXPZOm6CLZyPCMGsbIvkvn/un Guh2wtJ+2BdsyKhQurNmtT0NBZqbq4OlNpeSa9Jmud8J8bu4wCNrPUgWyuhdCZwCNKDtqmH6wl8I SOHDlna73nCDi+WofREVQzkOO9GuD4Xu0z9Zon/yBXAVRGnKsPsxkrWgTETothF0nM+8fLRo6eG/ n1u56+u7sWe5pIq9kY8dPRubiFUKm8KaRuwLjt9S5JiadrCYCtdHPIFVRbq2pnQcJAaU2F1EC8GY N3T2OMcjFpi2zRmLiMcy+gHC8MFXSiYvY6qW91ZxEuxV52lOXSwrvfrYx5lkFklhqEi6kMhjcxK0 DG3NdEzwFfrsLM2wgYW02AzYEvkmBMxg5mUctKBlSAdhAC49hwJSZ44XgUkBYgbCsJILRkgmUBYA 1SkitiSYmEJH5tA6XB1JOgtNrINdrkSYR0apjDTMXgWJSlP0vtFEEtZq8p/fiCVqKEYlE7x4lpKG aMNXnF1ZnWF2hEyJJLZotRI5XdidhoRi4eqUgYgMojGVW2+Bd6Wka/HBFGRI3nuNszaz8gNZifpr ET3OIbywWRCPAEDUCa8noNW2yma0iT3CpUE4O4HYn4UygtwlSfNsqeBs3jmkNRBAXDyw2iVptPum FRdc76C1RDYQRwKIxa9rU6BDUcZouiJbCkudWXmw6GV50IGs7um28sIQqkJXiXmZHDceIb9pnlc/ MGBuj+BXwHGQUTCSW0bYJoViZPEwxm9a4EySPI4zK5RLGNot1hA2HeSHGJWWGYZhiuVpXjW5w8nN z2MAcyDBDhxgTOAwUmA6AzFiV1Tygkb7jCTyAlhQSy4aC4NJ6j673NF6fp73KeA4Ay1JBISxOer3 F2rEqDrcz1qNMYuNJMzzcDCYKiLBeOLi8kT/E3ktVlm2yMKju0u7nSMjHAPM2PJ4k8TGosJzZ5sb XQk8okGZWRJzPTkTx0DjXW94lPACl46Ei6+WO2mpzW06bC8opPcTIDxKg2AzNfWbConlmYqriUY4 mrTa1hUEbC83H/jfdp0OBzaLXFOnJ1DA9hVarKTudRWAtZ+YDdY9mQ8qNr7Q8auw2ZdYKuD4ZN/B Q0DbGe0iopG0wxA0hx+lHf8i9IWC631fwjyI3qbUgiEj1wDQ/pA5DkRq6EciJ+0TjQOHnRrQOVHz IFihqIRkKpOZHXQJLAa0DUH9CkwGNH6okCJqALEC0Paa6PLXWjAOwFRMokZQjm0+wxncFvG2NEF6 Ea0B3C+QTE1YbseHijQiWBsLAWFQodt9RE1LCGw9DZAuTt6z4SO7AF9RUpfn+ks/LTfoJ/Ea/SJF 7/sLHzIgewXnyjHQiRlhFld6fRmkavC0L1LBBlrD7j7FygHxOnIwtiHAaQrj9kgD9RQazid5vPvL dxJwkpcykjwOnMOhqGIaDIPlvMzy+GfRdREEJMcS4rpMzIiJWjjOMjWah53l4Mio7hZmOFw8K9tT CwYUGRVRisxnvoKZFdEsSM0lgBcvUT1MSN2HfW8Yywt5ToAPkWpHZPLjcw5mM2uCYfddzN5d400k auJUlmbSlKohJCtDt1gJJiJ3cQXVfINqhxJHIxrA/ccOLL5Kkf5mlbWKPyOxuOnOuY45uGRHyB/u /KXKI4hE8qgpEhmTJkcYjJVENBLLsd5GhYl+weqG0dS0vOZQQN5otLD5kakeapFq1EgLUYAMeVSs 3ZxxXhbCD0l1NVnC5xcfVqNnarcQgx6mqKvqi1XRJZiAOrp7oUpXfhWExBClBnoJghZVg6HDOBRH VupLR4KIOjxFJqLbjluuIaCeVFqDrgA0UiHjnrAeYFR5jikYwIHM2nASjSeB6+svOJSVL0HcTxOw tgrBsfwR4o2If7ylz1f/A0iZEX8seIxvW+O9EkwEKTsVhHkPqgOIlfz8W2CJBZDlBfGKLYckeRG5 fOR2Ak0z5xLZeJVTPFDm1ehDua1PSHs6JhXvA8x+1Ujkk4iUn0gmWAwz/eA61ZjKf9eGyXmFIBMC kGM0izQX+oGTmlyS7pr10kUa+8pVIAygajJVnI8T0Pa0Zpo7uADg6nIxMDmfDmODxDqMcAqSoiEl QmSDSk3QqUblwKLEwimFlKoSk+GSKlcCXxg2ftbrbgajlBoXo01pGOjDsBihDIxHeAVnnaDkwc1a aC8wFKvMAq0RGgdLKIyFzMB34peqKKmCtgTpu7DdkyCNaJApMgeDAaRd62qrIbcTOskkteJWL8ls 71iFevPAZRc5rK3Dhv4EG6wGBAHrEYOe/Yi/3H1m77eVuAdD0VZ6nYo6KxJF5UzMkvQYX1wANFGA 2yePeJEQOL1LsiCaFs/Mz0i/acakYJ2yIHzlJG8yZDJUZkxSkUgLiXsZu7A0OZVXSdS5Je80m86n wkXE2VaYSX0NxIaEISkVkzYOnrqyOUyKa3PdRzJl2d6gdo0lTht7I5ixnHTnzyJ0u/mGWR2b7ehI sYYGZoIERLIJvjp+vHoiYIpXU7BImdJNLv/5fYd/Vpw1Nk8zoMw1KU4foEsqBSRIsAtKII+JoRWn xFjdgjeoVdhRjUCuwr4Cos+xttuDuQu8cyJVsEOeFyWCZKv6iRiBaKhFI5DnuLknon55w8I7T1lQ wI8hFCIpHUYLghTg9EDxYRY2gYK7tjBahhDXUvDulC7ApgrUMwMdLwqiVIYRjYGCuklbo0pvlOG9 YdZiJDCBabbWt5G2dB7CV2WuMLBfd7yUwtKUWq4sWI47ySEeRNYyEQE4Bj2OHIkLTgNr950NZuMY nQ0niYhwJiVxkYgpBuWWbDM8PYccSxUh9Z8DE3IXQqN9KGAPVmcD1i7kinChIexiPUQ= --===============2318795399835260673==--