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

--===============1632552609==
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 11:13:23 +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 $pidfile to be created.");
       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;
 }
 


--===============1632552609==
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: 6b0d1fdb6a805b0f3c497c81fbea6e77fca71932
# timestamp: 2010-10-12 13:14:07 +0200
# base_revision_id: bjorn.munch@stripped\
#   lwe80a2k6hcrqre6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYDwZo0AAdpfgFAwX3f//3IC
RAC////wUARmXvPaHm969dKu88BJJNEZGk9TYjU8TEU2R6hNNqMRpvUjQJQiDQ0MhMVPE0Q0aAA0
ADQZECFP1J+kajT0np6p6QeoepkABoADakmTIRP1QepvVHqeoMgAAAGgBJJGptT1TxNNJ6TE0YBP
U0AADRoPB4/oLaryGDob1y8yy6uxMZXSS6UjVhBI+S++HTDJOCcTszZEH4ygPvdf87+yGmbb6Yu6
speBnaL0jYZgy9l9JIdGivWxtyCaPQCkpxTxhm2vWTdvBXzqqsFiQcq4XNm7ivUamC5E9lawZJRq
3XCHXRL4opFCxGbF+ZiXYjUWYBRsSlhoGBmS2DLYNSxfo10jybEUxkIj30u5ngsS3B5mifVI+5VT
fokEMkVKYdGXFkegg2uuI8l04ZAeNBzhkJkOGCK8EXv47XJm1VEbO+vicQSruLcjk97LKEWwZPBL
xcU1m1Fy2aNhF1SLSxYysqehp4jRfKGlAyB9K04j870odV7I2lhLubZSzWvRTMdASdYL9hG5jIMI
kAeJlCuhSY7zggcEVJuBepFxTMW6x0KERqWTnHlXuUBC8MRx2CaTV3fFgUVy8Vg1pA0SilgaRQZV
5V8aiyCOTnom0bH75+iFeY86Sxk2hm5mpjSji+V+8ZyTxidfDUes0daZqdNDBFtgl6vUx2TCKTG8
K+NVGxhZZdYcsrXSTfGtbKdYvwIYRJE6X5FGVSMgZU2KO0KHKUD0aIAPgje8VjxGGvolGdrEFFvc
uN5IjBEKD30hjxQKotITAyqYGCE7g4Cwrv0j7DndbEQ+JPIDGWi1W2aa3w0TogpZ4DDazVGUznHr
KSYgNZtpcwusViuLRnebG4vS8iSVi4i4V4dshbwikGZC6QUtoL1McUi5ZGzLm156I0mdVZV+p8K9
+8xo11RO4n+jSfU3GfsbbPy5VvgYFR5VDiNdq8dHKPn5zBrrgYi602MUSolF7unOwmb5L6o658K6
V6/qxlyzPBMqlaRTqit1Wfc6srrRoWZNHPKD0+KssAYnz9OQeYBXiBEthDK2NtzGynQTyNQdEE9J
3fYYcInAtoazep5eGYXKyFjPQKA3W8G119PynOavP7uLzbUhoT5ZWxcQmlWqH1wqioC7YGpTPp59
SRD3F2Lk7xcqyF1gbTm2i2Cq1Z1oLgVhW4LTbMr4hj9mpqxTfmYhRRgUr6pGG9OzaWV8I4vL4nxR
Du6M9oOaRi4f36Za6CVpEh0vY4g+lkh4SgMF2Zai7KMhmTLq3A8FugsWgkwZaQuaS/EKxLNUfyRn
eRxwmVSmX4MxYGuDZu0HczucEvL4ZxYIRNhi825WMKkKCelLzaHkR1SFMstJJgVHGgEXLUYPSGkK
p2CsIa0nY8OR9zI6GmCp2LNykcXXA1iW1UV96/NLgR9odF6S3xXqVcVmPZu0tYe6gaUBcjO8X0jF
PC/bQkUheGKdBFqVJY43nZt68CiBb4XIg3dSkztwSvhmSD4QEwyTqMkbafkFIJOKTZPLNoianxrd
/xdyRThQkIDwZo0=


--===============1632552609==--