List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:July 12 2011 8:37pm
Subject:bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3342 to 3343) WL#5569
View as plain text  
 3343 Andrei Elkin	2011-07-12
      wl#5569 MTS
      
      adding suppression due to expected warning to rpl_circurlar_for_4_hosts;
      decreasing a loop limit in rpl_parallel_switch_sequential in case of statement format.

    modified:
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
      mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test
 3342 Andrei Elkin	2011-07-12
      WL#5569 MTS
      
      
      Fixing code and test due to rpl.rpl_circular_for_4_hosts  mismatch failure, like
      http://pb2.norway.sun.com/?action=archive_download&archive_id=3608382.
      
      The reason of the mismatch was that when having two group of events to execute,
      the first for a Worker and the 2nd for Coordinator, Coordinator waited for
      the 1st group completion but did not verify success of synchronization.
      So in a case of the failed applying of the 1st group processing of the 2nd 
      could find an inconsistent state to end up with a segfault (even though only
      the mismatch has been seen so far).
     @ mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
        results are updated.
     @ mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
        Test is updated to include a part specific to MTS.
        While all former conditions hold, the new section makes sure B server
        has two group of events to send which was not previously guaraneed nor necessary.
        Further, when the first of the two fails with Duplicate entry at applying of the 2nd Coordinator
        senses the first failure and gives out the 2nd.
        The first error remains to be seen in show-slave-status.
     @ sql/log_event.cc
        Checking wait_for_workers_to_finish() return code in case Coordinator executes a sequential-mode event.
        Comments are deployed in few other places where that is unnecessary to do.
     @ sql/rpl_rli_pdb.cc
        Worker marks itself as failed to apply which fact is reported to Coordinator
        also through wait_for_workers_to_finish().
        Coodinator shall check the error code in a branch of a sequential event applying.
     @ sql/rpl_rli_pdb.h
        Adding a new state that Worker sets itself to indiate its failure to apply.
     @ sql/rpl_slave.cc
        Refining an assert as consequence of the new state and its actual setting by Worker.

    modified:
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
      sql/log_event.cc
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result'
--- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2011-07-12 11:46:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2011-07-12 20:36:17 +0000
@@ -7,6 +7,7 @@ CREATE TABLE t2 (a INT NOT NULL AUTO_INC
 include/rpl_sync.inc
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression("Slave SQL: Coordinator thread of multi-threaded slave is exiting seeing a failed to apply an event Worker");
 
 *** Testing schema A->B->C->D->A ***
 

=== modified file 'mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2011-07-12 11:46:23 +0000
+++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2011-07-12 20:36:17 +0000
@@ -32,7 +32,7 @@ CREATE TABLE t2 (a INT NOT NULL AUTO_INC
 --connection server_4
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
-
+call mtr.add_suppression("Slave SQL: Coordinator thread of multi-threaded slave is exiting seeing a failed to apply an event Worker");
 --echo
 
 #

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test	2011-07-08 19:40:52 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test	2011-07-12 20:36:17 +0000
@@ -42,7 +42,7 @@ let $alter= 0;
 let $i= 200; # with bigger value test times out on some PB hosts 
 if (`select @@binlog_format like "STATEMENT"`) {
    # relax mtr to scan unsafe warnings
-   let $i=100;
+   let $i=50;
 }
 while ($i) {
   if (`SELECT 10*RAND() > 8`) {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3342 to 3343) WL#5569Andrei Elkin13 Jul