From: Bjorn Munch
Date: November 12 2010 1:45pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3111) Bug#58115
List-Archive: http://lists.mysql.com/commits/123729
X-Bug: 58115
Message-Id: <201011121345.oACDjrWD008430@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1838010919=="

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

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

 3111 Bjorn Munch	2010-11-12
      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.

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-11-05 14:36:00 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-11-12 13:44:32 +0000
@@ -4651,6 +4651,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");
@@ -4659,29 +4663,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;
   }
 
@@ -4694,6 +4703,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;
     }
   }
@@ -4718,6 +4728,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;
       }
 
@@ -4734,6 +4745,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;
       }
 
@@ -4742,6 +4754,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;
 }


--===============1838010919==
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/srvrest-51/
# testament_sha1: 8afd7492722f4bcfa471e1f9195caf4d37adcf57
# timestamp: 2010-11-12 14:45:53 +0100
# base_revision_id: bjorn.munch@stripped\
#   2d50hzi115nr7nhd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcryUU4AAlRfgFAwfWf//3IC
FAC////6UATm2XpTo7pruypW63QkkIJpoYQ0j01PITEaEaeoZDINqDJNGhNNNTE1T1PNQnpPUaHq
MgGgaACUJoSjEemp4mUyAAND1ANAAHMAmmATIYAAmCYAAAJJASngp+lJ5T8RMKeSek0yB6jQaAEA
IFJb067yKADemrxGJUdI3W+13XFEe+HW2RAR3zYU43KBHlihCEV2cBPQnOOfMD444UQ9a7/rwYZh
H61CFzyxAK1tsJ2USIqRV1sW2hnUFabR6GvnKjVf2VT89X3CP+z0Gnl3b01qAOm7fylSnQ0b4YI5
6xlJ7OYSX7tNIYUSEmFExjJhqc1RTC6rTdnbxM+qF4zKdgYrGERszdyO/kdsNRjcuzFTycZNMlR7
CK0+Bcgnf2idLpGmrCXFb/HyDYrexIvBOaTWryDBBq+K3QEDsVRD0iWteRUQ7HBKpQBnuxmdi8hW
oT7RwFeVRmCPg7aNnL0vLATQFA4gYPLRhAmwnKyZYgsEOJ7w3hRpDnkVNXDJ/bQa6PkJQnTyAttw
eM5hMBuBQ+ILREUUxuHl7ZVhSWDA8roWK8W6qk2Z+I9hKwPTQFVnewUXf3UHGE9kXZoVQyxDgpgC
6QviDw7hQk7EBhpWeZCaDIHIWwf/BHeLxW6Jzz3PCijMaAm6RjFtLV/RkKnz50KBc4wUpGlcd7bE
iBC6x+GC9akT45TDwRFLtND/uQuEY26pjxCggGQhzJShYSGHQXDHaM6LrWtW0L4b4hqzo6jsGtMX
v29ca33pDCy3ZjB8Kh2DFLXNOakQc8PikLOD3FGR4SIDRTuyAaSfmQ7wO63Xple4bh+OO5I2JE8b
MMze+0fmX8/jr+mKPBA3UgdZAfkJ6zG2mfDSOHnp6Hcq0i3nG6Abn8qaXxbZkVwEEfUIW4O3QV7t
0h5NaF5gM73opf8HYW7EK4k5HzL6JaG347ULXWpcCeDnJHJIpjhGIODnIlzseKgqLZG+piU4qeA9
vC3mUIKZR5ifIYv91Tpx0Tu+jhtMAWgr9WK5XT9mq/hNTZxZz5wy0Bs22YiWfRbyVK+Z3lasvhjI
uMuRUxupBRUWitkQIQpbbZBtLc8n11DnCBybNgx9EFGQLQWr1dRqInblWYgmC7Bt7hcLtLdCkTgT
wxKpYoJx5Rc7almBRvTJXZhaifz6LG7JLWC1GUsW1REXiFD0jz6tEIGQMW3F/kHAM5b3Gzacj38U
juxWtp16gfYHJcNwSCDgcF+WRIadu/G4ZrI5lNVyEYCbSvJ9KD+oK1kx68pvFn8y6cj780ilKUV1
15kWqD0hk47Rip9zJEw+BCLwXgq6ElGxEmTLgcdjhF+wFEPax3vgW+4kPhImByygtr1tqo466VPF
rZlAjtU1kUFLYMHhYGbRGQaDUnCDCCSweSR10W9kMg238YE4z6FSoJifLgT3KERlJqgfubWIoVyS
E3ZcIV/zmEooCSfaeWPaUqFGS7qALKhs0kPn7059gF9tEO1CQHEoQBkcqhGKmZR8qo7dhTkukiA8
zighUogaalKkzLXlc3sFXQkZoMB1gYLizibMOWrT0tBBE6vl6CzZ4uMgeuRIhp2WeGQsKlMGDPKQ
xM/O9lPo3kekZQmoG/ugG0dY/MlBVWd6BrkH/F3JFOFCQyvJRTg=


--===============1838010919==--