From: magnus.blaudd
Date: May 30 2011 2:41pm
Subject: bzr commit into mysql-5.1-mtr branch (magnus.blaudd:3002) Bug#12603874
List-Archive: http://lists.mysql.com/commits/138399
X-Bug: 12603874
Message-Id: <20110530144142.B01B813402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4534254520672266874=="

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

#At file:///home/msvensson/mysql/5.1-mtr-bug12603874/ based on revid:magnus.blaudd@stripped

 3002 magnus.blaudd@stripped	2011-05-30
      Bug#12603874 - mtr.pl should dump cluster log files when ndbcluster_wait_started() fails
       - We have seen mystery cluster start failures and would like to improve our
      possibility to diagnose why the cluster processes has failed to start by
      dumping the cluster log files to stdout.
       - This is a huge improvement compared to before when only the
        message 'Start of mysql_cluster.X cluster failed'

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-05-09 12:53:01 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-05-30 14:41:34 +0000
@@ -2544,6 +2544,41 @@ sub ndbcluster_wait_started($$){
 }
 
 
+sub ndbcluster_collect_logs($) {
+  my ($cluster)= @_;
+
+  my $logs= "== Cluster log files: ==\n\n";
+
+  # ndb_mgmd(s)
+  foreach my $ndb_mgmd ( in_cluster($cluster, ndb_mgmds()) )
+  {
+    my $datadir = $ndb_mgmd->value('DataDir');
+
+    # Should find ndb_<nodeid>_cluster.log and ndb_mgmd.log
+    foreach my $file ( glob("$datadir/ndb_*.log") )
+    {
+      $logs.= "$file:\n";
+      $logs.= mtr_grab_file($file);
+      $logs.= "\n";
+    }
+  }
+
+  # ndbd(s)
+  foreach my $ndbd ( in_cluster($cluster, ndbds()) )
+  {
+    my $datadir = $ndbd->value('DataDir');
+    my $file = "$datadir/ndbd.log";
+    if (-f $file)
+    {
+      $logs.= "$file:\n";
+      $logs.= mtr_grab_file($file);
+      $logs.= "\n";
+    }
+  }
+  return $logs;
+}
+
+
 sub ndb_mgmd_wait_started($) {
   my ($cluster)= @_;
 
@@ -4948,6 +4983,8 @@ sub start_servers($) {
     {
       # failed to start
       $tinfo->{'comment'}= "Start of '".$cluster->name()."' cluster failed";
+      $tinfo->{logfile}= ndbcluster_collect_logs($cluster);
+
       return 1;
     }
   }


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   h8ye797zo3wwvb4k
# target_branch: file:///home/msvensson/mysql/5.1-mtr-bug12603874/
# testament_sha1: c07639a4ac3cccc46a5e697ab7005405db47cf5f
# timestamp: 2011-05-30 16:41:42 +0200
# base_revision_id: magnus.blaudd@stripped\
#   whq6p8058hbj105u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWgdNDMAAlPfgFAQXPf//14A
DMS////6UAWbrdm8o45vVeRR73utmg0QmRoJpkzIk2mpp6jI000DEGgNA0IBNNDKZI0yGgGgAGQN
AaCU0QlP1KfkNGoyj1PKAPSep6ah+qDTRiBoJIoTKeKbCE9JkNqaGnpNNAA0AGgkkCCYmKntGpiZ
NJ+mkaR6mpkB6mQZEQgBN4bGS1biX3+pr2bZ418BYCHEHlmSMXnlkMZPjiLYr8gH9x54HxDP84Ny
qxIFEhLQJyUPL3chSwOsid97VMu7r6UJFvYfqVREO5hDmlZsD36D18C3Oeibc35N6oLFMleuuMmW
jCPsbH6yohgECJSinoHukwd2W5+B9nvBrF3qtlA4oFa5sNYxYHYbkoECQGMxnZyVqzZK6+ZrcGvd
BFESG4uTow5nEzjnUNAy0kiL02q8eZcE5EhxRA5vrpK8kV+BUftRVuc7xi4sgicCrt0suGdQzSLA
0hWttzwUxkQpIhKnxQjEVJzLUcYhSy0Osf6rkDCHuAtcxFxpGEbwYI+dAPJJlJoQwpRP2mDh1iqB
H9BQYmHwoEOfYfMPPOS3CVgLWXALBbI0B1YpyVHbbWJHwyaq0DHZsCzBCIJjcDkx3FuiMAq3bPHU
1AjvJpXcXirqNtKb5TO/GYu+TavCtJoFlacSE4DdacKynXcTaG0aTWYzvoF9zErum0XBYqysHiYq
4TcQ2x0GJOFHid90TcSDE0tONuIRYyvGSgfC8PnOZAw0QvRNnGP0C1s7LJhOBaj3WujOiQzAqTLE
tggLwYKDNoDCqMnOESfW8RBgs4KVAFY4HSVdA8EycpCgrB80XLFRpQPW6JsMgcUDnZUUjmCli5G3
inQhFv0JdG8khymMH26tGfz7IQrslX7J8Gm7MUzJIXf7Z4nSUiEZ7rSwu39qmbfzxJDENVaGII2Z
PUrHhryInWRmPpXSCQ54Ujw8vBIjDbB1FMkdBvzihCmY+jhB8SRDq29tWvHcVigmNIyO3YcBOXzk
iGFgckiHhztKPgd+a9m4/H6De9/uw2E+PeqVuLkgdkitGs2AxKmLEiyKhZr2YgaccZiEGa9zsOfC
62hRXyHPDgkXA9JSwSMNVN2Q8Mp55YWYpBfvqCAfJOA4anUMFIMiJCL4b0ifeCSwYZEZrHGhLQJi
ozdMAwxrSGr25R50m2qYQWXvV1nuqQMp5AmgKTK4SobYyr5Oi/UbW3UmyYcxMiPF6g/rNy2l+nFx
kYmBpjx8pEhxaFNB5xn5Fhmf51HLoxoDm3Iv9Hh1NaIsczqzIdnLeiAKsiI7g/Y3idyCc3BxU20c
l8kgMO/qeBEK9GDTdPSS0Y4XxCQYXAE4GBegML0Q6hdDp9uXdHALD5jGj09As8Lp2uB5zOx5ZGLJ
oO3BqD37wqCpwPqSOaoApSGT2kMjNr2twzKJfkTJj72nmBTYqqh9i/DIWVgjeHsfwM46K5FTcKNr
FxDLrDsII4KcNEC3tAQzAuNZG211hbCEWEZoFEx7LoQg0RqSTCSd8Sk2te89nPlGomdmHWm5DahZ
cFbX4BBkSUh3sRxXj1SJQlS5XUz03HajrScTotfYJQ5OZOKWzCrp4TTSKbA+g5GmbA2haw4wsLDO
OqxiAbKVJLSwRikoopck0Rq9XNC7cDIFlnRYRDbs8UTpsxrOQ41zMScrgRkzXyVythCoHzqrPJuv
JFarZaChtKAjWETB4+/ZwYa4ng/xPie6BFgkvViM7hLUwY62LRmU981h5RROGlWgzl51RgaFY5ki
cuDZmz0rmkNN9TRS4aEh0BBjOexkKFrTK9HfgYgxrnF6i54E8wydIC8twveRPzF4xmFmOvfuJugq
rjsNrycPIf+LuSKcKEg0DpoZgA==


--===============4534254520672266874==--