List:Commits« Previous MessageNext Message »
From:Luis Soares Date:May 7 2010 9:47am
Subject:bzr commit into mysql-5.1-rep+3 branch (luis.soares:3140) Bug#44209
View as plain text  
#At file:///home/lsoares/Workspace/bzr/work/bugfixing/rep%2B3.push/mysql-5.1-rep%2B3/ based on revid:luis.soares@stripped

 3140 Luis Soares	2010-05-07
      BUG#44209: MASTER_CONNECT_RETRY and --master-retry-count disconnected
                 from each other
      
      Post-push fix! One of the test cases is not robust enough because
      it depends on a time variable. This can cause it to fail because
      it is a source of non-determinism (especially on slow environments).
      
      The specific test case is about waiting for slave to stop after
      retrying the N expected times and then checking that no more than
      a number of expected seconds has ellapsed. This assertion is not
      deterministic.
      
      We fix the assertion by checking the number of retries reported by
      the server, instead of checking how much seconds have ellapsed.

    modified:
      mysql-test/suite/rpl/t/rpl_change_master.test
=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test	2010-04-19 21:34:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test	2010-05-07 09:47:44 +0000
@@ -198,11 +198,16 @@ if (`SELECT $retry_count5 <> $retry_coun
 CHANGE MASTER TO master_retry_count=3, master_host='dummy', master_connect_retry=1;
 START SLAVE io_thread;
 
-# limit wait timeout to 4 seconds (should be three, but this is not much deterministic,
-# so we set it to a value higher but close to three - keeping in mind slow machines in
-# test environment). Also, see wait_for_slave_param how slave_timeout is used.
--- let $slave_timeout= 40
+# We wait for slave to stop and inspect the number of retries in 
+# the error message.
 -- source include/wait_for_slave_io_to_stop.inc
+-- let $error= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1)
+if (!`SELECT "$error" LIKE "%retries: 3"`)
+{
+  -- echo Unexpected retry count value! Got: $error
+  -- echo Expected number of retries was: 3
+  -- die
+}
 
 ## check that there is a parse error if not using a numerical value
 -- error ER_PARSE_ERROR


Attachment: [text/bzr-bundle] bzr/luis.soares@sun.com-20100507094744-3ogoas6y2bxy07ob.bundle
Thread
bzr commit into mysql-5.1-rep+3 branch (luis.soares:3140) Bug#44209Luis Soares7 May