Bug#27179346: AUTOTEST: RESULTS ARE NOT COLLECTED IF ATRT FAILS

VarunNagaraju · VarunNagaraju · commit d868cde8d61b · 2018-02-16T11:43:07.000+05:30
IN CONFIGURATION STAGE

Description

Autotest can only collect results after it's run. However, if atrt
fails in the configuration stage, file configurations and core
files never end up in results folder and hence are not
collected as part of test run.

Update autotest-run.sh such that when configuration stage fails,
log and configuration file are stored in the result folder.
Additionally fix atrt's mysql initialization code to return
false if initialization fails (prevent silent error).
diff --git a/storage/ndb/test/run-test/autotest-run.sh b/storage/ndb/test/run-test/autotest-run.sh
@@ -26,7 +26,7 @@
 ##############
 
 save_args=$*
-VERSION="autotest-run.sh version 1.15"
+VERSION="autotest-run.sh version 1.16"
 
 DATE=`date '+%Y-%m-%d'`
 if [ `uname -s` != "SunOS" ]
@@ -364,20 +364,35 @@ if [ ${verbose} -gt 0 ] ; then
 fi
 
 # Setup configuration
-$atrt ${atrt_defaults_group_suffix_arg} Cdq ${site_arg} ${clusters_arg} ${verbose_arg} $prefix my.cnf
-
-# Start...
-args="${atrt_defaults_group_suffix_arg}"
-args="$args --report-file=report.txt"
-args="$args --log-file=log.txt"
-args="$args --testcase-file=$test_dir/$RUN-tests.txt"
-args="$args ${baseport_arg}"
-args="$args ${site_arg} ${clusters_arg}"
-args="$args $prefix"
-args="$args ${verbose_arg}"
-$atrt $args my.cnf || echo "ERROR: $?: $atrt $args my.cnf"
+$atrt ${atrt_defaults_group_suffix_arg} Cdq \
+   ${site_arg} \
+   ${clusters_arg} \
+   ${verbose_arg} \
+   $prefix \
+   my.cnf \
+   | tee log.txt
+
+atrt_conf_status=${PIPESTATUS[0]}
+if [ ${atrt_conf_status} -ne 0 ]; then
+    echo "Setup configuration failure"
+else
+    args="${atrt_defaults_group_suffix_arg}"
+    args="$args --report-file=report.txt"
+    args="$args --testcase-file=$test_dir/$RUN-tests.txt"
+    args="$args ${baseport_arg}"
+    args="$args ${site_arg} ${clusters_arg}"
+    args="$args $prefix"
+    args="$args ${verbose_arg}"
+    $atrt $args my.cnf | tee -a log.txt
+
+    atrt_test_status=${PIPESTATUS[0]}
+    if [ $atrt_test_status -ne 0 ]; then
+        echo "ERROR: $atrt_test_status: $atrt $args my.cnf"
+    fi
+fi
 
 # Make tar-ball
+[ -f my.cnf ] && mv my.cnf $res_dir
 [ -f log.txt ] && mv log.txt $res_dir
 [ -f report.txt ] && mv report.txt $res_dir
 [ "`find . -name 'result*'`" ] && mv result* $res_dir
diff --git a/storage/ndb/test/run-test/files.cpp b/storage/ndb/test/run-test/files.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -257,6 +257,7 @@ setup_files(atrt_config& config, int setup, int sshx)
                              proc.m_proc.m_cwd.c_str(),
                              tmp.c_str());
             }
+            return false;
           }
           else
           {
diff --git a/storage/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -209,6 +209,11 @@ int main(int argc, char **argv) {
     goto end;
   }
 
+  if(!g_config.m_processes.size()) {
+    g_logger.critical("Error: No processes defined in cluster configuration");
+    goto end;
+  }
+
   if (!configure(g_config, g_do_setup)) {
     g_logger.critical("Failed to configure");
     goto end;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`
`4`	`4`	`This program is free software; you can redistribute it and/or modify`
`5`	`5`	`it under the terms of the GNU General Public License as published by`
`@@ -257,6 +257,7 @@ setup_files(atrt_config& config, int setup, int sshx)`
`257`	`257`	`proc.m_proc.m_cwd.c_str(),`
`258`	`258`	`tmp.c_str());`
`259`	`259`	`}`
	`260`	`+ return false;`
`260`	`261`	`}`
`261`	`262`	`else`
`262`	`263`	`{`