From: Bjorn Munch
Date: October 12 2010 9:08am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3098) Bug#40406
List-Archive: http://lists.mysql.com/commits/120543
X-Bug: 40406
Message-Id: <201010120908.o9C985wK026027@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0528145815=="

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

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

 3098 Bjorn Munch	2010-10-12
      Bug #40406 Please make mtr print better messages when servers fail to start
      Added some more details to warning messages, this should be enough.

    modified:
      mysql-test/lib/mtr_process.pl
=== modified file 'mysql-test/lib/mtr_process.pl'
--- a/mysql-test/lib/mtr_process.pl	2010-06-14 09:31:22 +0000
+++ b/mysql-test/lib/mtr_process.pl	2010-10-12 09:07:15 +0000
@@ -116,18 +116,20 @@ sub sleep_until_file_created ($$$) {
       return 1;
     }
 
+    my $seconds= ($loop * $sleeptime) / 1000;
+
     # Check if it died after the fork() was successful
     if ( defined $proc and ! $proc->wait_one(0) )
     {
-      mtr_warning("Process $proc died");
+      mtr_warning("Process $proc died after mysql-test-run waited $seconds " .
+		  "seconds for it to create a pid file.");
       return 0;
     }
 
     mtr_debug("Sleep $sleeptime milliseconds waiting for $pidfile");
 
     # Print extra message every 60 seconds
-    my $seconds= ($loop * $sleeptime) / 1000;
-    if ( $seconds > 1 and int($seconds * 10) % 600 == 0 )
+    if ( $seconds > 1 && int($seconds * 10) % 600 == 0 && $seconds < $timeout )
     {
       my $left= $timeout - $seconds;
       mtr_warning("Waited $seconds seconds for $pidfile to be created, " .
@@ -138,6 +140,8 @@ sub sleep_until_file_created ($$$) {
 
   }
 
+  mtr_warning("Timeout after mysql-test-run waited $timeout seconds " .
+	      "for the process $proc to create a pid file.");
   return 0;
 }
 


--===============0528145815==
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/pidwait-55/
# testament_sha1: d1c4d8b129eb4883bab9006c15d58ee203004f42
# timestamp: 2010-10-12 11:08:05 +0200
# base_revision_id: bjorn.munch@stripped\
#   lwe80a2k6hcrqre6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW/HY/gAAdzfgFAwX3f//3IC
RAC////wUARh3HSLvXpouu2vaEoiZDU0ZDU2mKehqnmUwo9TCMh6Q0DSaTRplPTTE0ap6TR6gAAA
AAEkJPSBqEZMU9E9ENA0AD1A0AJFUyTyhptT0jPVMyT1MQwTCaMmjEASSUxoieU9qeojaIek9TQ9
EyAAAHEcDh1BdZuHNoX196i3ZZainvshtmRCfc2EUN0zpnQ0gjDSqr7jfNh47Nvxfi6mfV6cWa+2
X5Eiv9JVFUO3sl8HZNdHRsViner1CVFu7+Uej2eyeL2KqFXgN0rG4Yz82xXft67WG5paq8hkTTLP
NDM4j6xz9pJSRkxZyfopOnMvG4jFofQxxNNpQGoDnZ4SwuEZPMcREuC3WnPRZCirxCk68j86CdRz
X2gQyRqUj4Un9HVKD2t5dc3SNc/bAXDXTG6icQwqJkrzZNBmpJQT9DE1FUICtU3a0Y5JQ29h0g+e
ELo7G3+equIo8CbRoH0sVRMlB5eh4RJKVdTlgmCYm0cHLrSHLYeBhcQX4CeT7NxjyMmEOLJkarG2
HbA0uD7jnL1/DRNjumHvdccdPVa7M4EPfLXRy5oBjATya6kR0u2JyMlSXAe2H7AUoyrBO2GHXLaS
ixsKnCNfRautQtGjn4LGKUGKg+gmq7PS6UiNosGQqRi8HeWUwVWTwa02gr9EprEDkgYhoODC3K6B
INhSiIlq/r7IWIYxmrC8NXAqQBJBt+djEzxxpjeVd2DM5qS1LOS6YlqFQmrU+RmPuY/TlqmuztUk
3+bOnREJo1VFO1w15IQmiQXFJ4NMBxk5klDNqypix7jPlwFjDy23ZUIjkpjAjMDFUeac6+Gt0mid
CRIppBRcTfCfESvgUVDTdTvrZUl5WKzcyowpbDzxZKWeNk7ZEVIUJGxGVI6qUrRMqy7pBhhn3wHZ
E66Hp1IpXpj2tgT5VwP9BElpXA8K6accamRIJv8lJEw4phHriMrJZQgyUmRHma+o1W+GdbcnXuqV
2eNcfq4x6InUmXAtBNlUczuGfidYWWIxJ6aiNISKSaw2mkpGFFWlkzx9BKZDjIWrWvNTCe8sauU8
JEciM8ajWoJWFBoTPNfh3xKR6RGlVt659ZR8IrLJPNhsNVSCuPhUtfiFGVMzvXbU+kLtQR5kod3e
W9EHXcV64JYOtDyNQuSu61aSQIBBwXnO9ViGP19NWZ/3yE9NNpFbkjp7E9c2XG4c4nGaTI/pwPvH
xSPQ5Tuztw2FmhIeTc4nlqZIlCQBgoerijGKUchmTKwWzWDwL6RG64NKzCvYcp+COcIRL+BYI1JT
RMopZlbobUFLihTwLHbTwjdamu4+gthfZbFaq4c8QuAoRAle2lZx6KuWBhhGhJPTi5g3pXYU+Zn0
jnLaVjKtuOuS5UzdRht0svI3PFnNUZg+Kyr0inDk3JWBUyBojSOcENReaERFRnxhpioJUIWhEhhc
Ec4MLxupMQJgqCtaRM9lCuuou1i6BZ9sB+Ip/qkh18yyF8EumIkB3KBPmWgmR5x4ggWlFxRMuSB7
Q77J/4u5IpwoSDfjsfwA


--===============0528145815==--