From: Bjorn Munch
Date: November 18 2010 3:59pm
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:2988) Bug#58115
List-Archive: http://lists.mysql.com/commits/124298
X-Bug: 58115
Message-Id: <201011181559.oAIFxDrf023896@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0628068132=="

--===============0628068132==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 2988 Bjorn Munch	2010-11-18
      Bug #58115 MTR should restart slaves between tests if master needs restart
      As we check for servers to restart, tag the tinfo if the master is restarted,
      then check (after all other checks) for slave restarts.
      Removed suppression of UUID warning which is now avoided

    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2010-11-09 20:10:44 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2010-11-18 15:57:46 +0000
@@ -241,9 +241,6 @@ INSERT INTO global_suppressions VALUES
   */
  ("Found lock of type 6 that is write and read locked"),
 
- /* After BUG#57840, we may restart master w/o restarting slave */
- ("The master.s UUID has changed, although this should not happen"),
-
  ("THE_LAST_SUPPRESSION")||
 
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-11-17 10:23:22 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-11-18 15:57:46 +0000
@@ -4721,6 +4721,10 @@ sub stop_all_servers () {
 sub server_need_restart {
   my ($tinfo, $server)= @_;
 
+  # Mark the tinfo so slaves will restart if server restarts
+  # This assumes master will be considered first.
+  my $is_master= $server->option("#!run-master-sh");
+
   if ( using_extern() )
   {
     mtr_verbose_restart($server, "no restart for --extern server");
@@ -4729,29 +4733,34 @@ sub server_need_restart {
 
   if ( $tinfo->{'force_restart'} ) {
     mtr_verbose_restart($server, "forced in .opt file");
+    $tinfo->{master_restart}= 1 if $is_master;
     return 1;
   }
 
   if ( $opt_force_restart ) {
     mtr_verbose_restart($server, "forced restart turned on");
+    $tinfo->{master_restart}= 1 if $is_master;
     return 1;
   }
 
   if ( $tinfo->{template_path} ne $current_config_name)
   {
     mtr_verbose_restart($server, "using different config file");
+    $tinfo->{master_restart}= 1 if $is_master;
     return 1;
   }
 
   if ( $tinfo->{'master_sh'}  || $tinfo->{'slave_sh'} )
   {
     mtr_verbose_restart($server, "sh script to run");
+    $tinfo->{master_restart}= 1 if $is_master;
     return 1;
   }
 
   if ( ! started($server) )
   {
     mtr_verbose_restart($server, "not started");
+    $tinfo->{master_restart}= 1 if $is_master;
     return 1;
   }
 
@@ -4764,6 +4773,7 @@ sub server_need_restart {
     if ( timezone($started_tinfo) ne timezone($tinfo) )
     {
       mtr_verbose_restart($server, "different timezone");
+      $tinfo->{master_restart}= 1 if $is_master;
       return 1;
     }
   }
@@ -4788,6 +4798,7 @@ sub server_need_restart {
 	mtr_verbose_restart($server, "running with different options '" .
 			    join(" ", @{$extra_opts}) . "' != '" .
 			    join(" ", @{$started_opts}) . "'" );
+	$tinfo->{master_restart}= 1 if $is_master;
 	return 1;
       }
 
@@ -4804,6 +4815,7 @@ sub server_need_restart {
 	mtr_verbose("Restart: running with different options '" .
 		    join(" ", @{$extra_opts}) . "' != '" .
 		    join(" ", @{$started_opts}) . "'" );
+	$tinfo->{master_restart}= 1 if $is_master;
 	return 1;
       }
 
@@ -4812,6 +4824,11 @@ sub server_need_restart {
     }
   }
 
+  if ($server->option("#!use-slave-opt") && $tinfo->{master_restart}) {
+    mtr_verbose_restart($server, "master will be restarted");
+    return 1;
+  }
+
   # Default, no restart
   return 0;
 }


--===============0628068132==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mtr-tr/
# testament_sha1: ccf759fdfa8da74c6d85e66f7de834d80a9bba93
# timestamp: 2010-11-18 16:59:13 +0100
# source_branch: file:///home/bm136801/my/mysql-trunk/
# base_revision_id: bjorn.munch@stripped\
#   nh1py01ubjmb1k3j
# 
# Begin bundle
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


--===============0628068132==--