Merge lp:~percona-toolkit-dev/percona-toolkit/disable-pt-mysql-summary-schema-dump-prompt-bug-1214685 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.6

[Daniel Nichter]

[lp:~percona-toolkit-dev/percona-toolkit/disable-pt-mysql-summary-schema-dump-prompt-bug-1214685]

603. By Daniel Nichter on 2013-12-12

Remove blank lines around Schema section contents.

604. By Daniel Nichter on 2013-12-12

Add back blank lines around Schema section contents. Use default vals for OPT_DATABASE, OPT_ALL_DATABASES, and OPT_READ_SAMPLE in report_mysql_info.sh to avoid errors in unit tests.

605. By Daniel Nichter on 2013-12-12

Merge

606. By Daniel Nichter on 2013-12-12

Fix tests.

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2013-10-20 03:45:04 +0000
+++ bin/pt-mysql-summary	2013-12-12 05:50:47 +0000
@@ -963,7 +963,7 @@
    $CMD_MYSQLDUMP $EXT_ARGV --no-data --skip-comments \
       --skip-add-locks --skip-add-drop-table --compact \
       --skip-lock-all-tables --skip-lock-tables --skip-set-charset \
-      ${args} --databases $( local IFS=,; echo ${dbtodump})
+      ${args} --databases $(local IFS=,; echo ${dbtodump})
 }
 
 get_mysqldump_args () {
@@ -1036,9 +1036,10 @@
    echo "pt-summary-internal-Config_File_path    $cnf_file" >> "$dir/mysql-variables"
    collect_internal_vars "$dir/mysqld-executables" >> "$dir/mysql-variables"
 
-   if [ -n "${OPT_DATABASES}" ]; then
-      local trg_arg="$( get_mysqldump_args "$dir/mysql-variables" )"
-      get_mysqldump_for "${trg_arg}" "${OPT_DATABASES}" > "$dir/mysqldump"
+   if [ "$OPT_DATABASES" -o "$OPT_ALL_DATABASES" ]; then
+      local trg_arg="$(get_mysqldump_args "$dir/mysql-variables")"
+      local dbs="${OPT_DATABASES:-""}"
+      get_mysqldump_for "${trg_arg}" "$dbs" > "$dir/mysqldump"
    fi
 
    (
@@ -2243,37 +2244,16 @@
    fi
 
    section "Schema"
-   local reply="n"
-   if [ "${OPT_DATABASES}" ] || [ "${OPT_READ_SAMPLES}" ] \
-      || [ -e "$dir/mysqldump" -a -s "$dir/mysqldump" ]; then
-      reply="y"
-   elif [ -t 0 -a -t 1 ]; then
-      echo -n "Would you like to mysqldump -d the schema and analyze it? y/n "
-      read reply
-      reply=${reply:-n}
-   fi
-   if echo "${reply:-n}" | grep -i '^y' > /dev/null ; then
-      if [ -z "${OPT_DATABASES}" ] && [ -z "$OPT_READ_SAMPLES" ] \
-         && [ ! -e "$dir/mysqldump" ]; then
-         echo "There are ${num_dbs} databases.  Would you like to dump all, or just one?"
-         echo -n "Type the name of the database, or press Enter to dump all of them. "
-         local dbtodump=""
-         read dbtodump
-         local trg_arg="$( get_mysqldump_args "$dir/mysql-variables" )"
-         get_mysqldump_for "${trg_arg}" "${dbtodump}" > "$dir/mysqldump"
-      fi
-
-      if [ -e "$dir/mysqldump" -a -s "$dir/mysqldump" ] \
-         && grep 'CREATE TABLE' "$dir/mysqldump" >/dev/null 2>&1; then
-            format_overall_db_stats "$dir/mysqldump"
-      elif [ ! -e "$dir/mysqldump" -a "$OPT_READ_SAMPLES" ]; then
-         echo "Skipping schema analysis as the directory passed in" \
-              "doesn't have a dump file"
-      else
-         echo "Skipping schema analysis due to apparent error in dump file"
-      fi
+   if [ -s "$dir/mysqldump" ] \
+      && grep 'CREATE TABLE' "$dir/mysqldump" >/dev/null 2>&1; then
+         format_overall_db_stats "$dir/mysqldump"
+   elif [ ! -e "$dir/mysqldump" -a "$OPT_READ_SAMPLES" ]; then
+      echo "Skipping schema analysis because --read-samples $dir/mysqldump " \
+         "does not exist"
+   elif [ -z "$OPT_DATABASES" -a -z "$OPT_ALL_DATABASES" ]; then
+      echo "Specify --databases or --all-databases to dump and summarize schemas"
    else
-      echo "Skipping schema analysis"
+      echo "Skipping schema analysis due to apparent error in dump file"
    fi
 
    section "Noteworthy Technologies"
@@ -2731,9 +2711,6 @@
 are fuzzy-rounded.
 
   # Schema #####################################################
-  Would you like to mysqldump -d the schema and analyze it? y/n y
-  There are 4 databases.  Would you like to dump all, or just one?
-  Type the name of the database, or press Enter to dump all of them. 
 
     Database           Tables Views SPs Trigs Funcs   FKs Partn
     mysql                  24                                  
@@ -2765,16 +2742,10 @@
     performance_schema               5          16          33    
     sakila               1  15   1   3       4   3  19      42  26
 
-If you select to dump the schema and analyze it, the tool will print the above
-section. This summarizes the number and type of objects in the database. It is
-generated by running C<mysqldump --no-data>, not by querying the
-INFORMATION_SCHEMA, which can freeze a busy server. You can use the
-L<"--databases"> option to specify which databases to examine.  If you do not,
-and you run the tool interactively, it will prompt you as shown.
-
-You can choose not to dump the schema, to dump all of the databases, or to dump
-only a single named one, by specifying the appropriate options. In the example
-above, we are dumping all databases.
+If you specify L<"--databases"> or L<"--all-databases">, the tool will print
+the above section. This summarizes the number and type of objects in the
+databases. It is generated by running C<mysqldump --no-data>, not by querying
+the INFORMATION_SCHEMA, which can freeze a busy server.
 
 The first sub-report in the section is the count of objects by type in each
 database: tables, views, and so on. The second one shows how many tables use
@@ -2949,6 +2920,10 @@
 
 =over
 
+=item --all-databases
+
+mysqldump and summarize all databases.  See L<"--databases">.
+
 =item --config
 
 type: string
@@ -2960,9 +2935,8 @@
 
 type: string
 
-Names of databases to summarize. If you want all of them, you can use the value
-C<--all-databases>; you can also pass in a comma-separated list of database
-names. If not provided, the program will ask you for manual input.
+mysqldump and summarize this comma-separated list of databases.  Specify
+L<"--all-databases"> instead if you want to dump and summary all databases.
 
 =item --defaults-file
 

=== modified file 'lib/bash/collect_mysql_info.sh'
--- lib/bash/collect_mysql_info.sh	2013-02-25 14:21:46 +0000
+++ lib/bash/collect_mysql_info.sh	2013-12-12 05:50:47 +0000
@@ -168,7 +168,7 @@
    $CMD_MYSQLDUMP $EXT_ARGV --no-data --skip-comments \
       --skip-add-locks --skip-add-drop-table --compact \
       --skip-lock-all-tables --skip-lock-tables --skip-set-charset \
-      ${args} --databases $( local IFS=,; echo ${dbtodump})
+      ${args} --databases $(local IFS=,; echo ${dbtodump})
 }
 
 # Returns a string with arguments to pass to mysqldump.
@@ -250,10 +250,11 @@
    echo "pt-summary-internal-Config_File_path    $cnf_file" >> "$dir/mysql-variables"
    collect_internal_vars "$dir/mysqld-executables" >> "$dir/mysql-variables"
 
-   if [ -n "${OPT_DATABASES}" ]; then
-      # "--dump-schemas passed in, dumping early"
-      local trg_arg="$( get_mysqldump_args "$dir/mysql-variables" )"
-      get_mysqldump_for "${trg_arg}" "${OPT_DATABASES}" > "$dir/mysqldump"
+   # mysqldump schemas
+   if [ "$OPT_DATABASES" -o "$OPT_ALL_DATABASES" ]; then
+      local trg_arg="$(get_mysqldump_args "$dir/mysql-variables")"
+      local dbs="${OPT_DATABASES:-""}"
+      get_mysqldump_for "${trg_arg}" "$dbs" > "$dir/mysqldump"
    fi
 
    # TODO: gather this data in the same format as normal: TS line, stats

=== modified file 'lib/bash/report_mysql_info.sh'
--- lib/bash/report_mysql_info.sh	2013-02-25 14:21:46 +0000
+++ lib/bash/report_mysql_info.sh	2013-12-12 05:50:47 +0000
@@ -1318,45 +1318,19 @@
    # Schema, databases, data type, other analysis.
    # ########################################################################
    section "Schema"
-   # Assume "no" if stdin or stdout is not a terminal, so this can be run and
-   # put into a file, or piped into a pager, or something else like that.
-   local reply="n"
-   # But dump no matter what if they passed in something through --databases,
-   # OR if --read-samples was set
-   if [ "${OPT_DATABASES}" ] || [ "${OPT_READ_SAMPLES}" ] \
-      || [ -e "$dir/mysqldump" -a -s "$dir/mysqldump" ]; then
-      reply="y"
-   elif [ -t 0 -a -t 1 ]; then
-      echo -n "Would you like to mysqldump -d the schema and analyze it? y/n "
-      read reply
-      reply=${reply:-n}
-   fi
-   if echo "${reply:-n}" | grep -i '^y' > /dev/null ; then
-      if [ -z "${OPT_DATABASES}" ] && [ -z "$OPT_READ_SAMPLES" ] \
-         && [ ! -e "$dir/mysqldump" ]; then
-         # If --dump-schemas wasn't used, ask what they want to dump
-         echo "There are ${num_dbs} databases.  Would you like to dump all, or just one?"
-         echo -n "Type the name of the database, or press Enter to dump all of them. "
-         local dbtodump=""
-         read dbtodump
-         local trg_arg="$( get_mysqldump_args "$dir/mysql-variables" )"
-         get_mysqldump_for "${trg_arg}" "${dbtodump}" > "$dir/mysqldump"
-      fi
-
-      # Test the result by checking the file, not by the exit status, because we
-      # might get partway through and then die, and the info is worth analyzing
-      # anyway.
-      if [ -e "$dir/mysqldump" -a -s "$dir/mysqldump" ] \
-         && grep 'CREATE TABLE' "$dir/mysqldump" >/dev/null 2>&1; then
-            format_overall_db_stats "$dir/mysqldump"
-      elif [ ! -e "$dir/mysqldump" -a "$OPT_READ_SAMPLES" ]; then
-         echo "Skipping schema analysis as the directory passed in" \
-              "doesn't have a dump file"
-      else
-         echo "Skipping schema analysis due to apparent error in dump file"
-      fi
+   # Test the result by checking the file, not by the exit status, because we
+   # might get partway through and then die, and the info is worth analyzing
+   # anyway.
+   if [ -s "$dir/mysqldump" ] \
+      && grep 'CREATE TABLE' "$dir/mysqldump" >/dev/null 2>&1; then
+         format_overall_db_stats "$dir/mysqldump"
+   elif [ ! -e "$dir/mysqldump" -a "$OPT_READ_SAMPLES" ]; then
+      echo "Skipping schema analysis because --read-samples $dir/mysqldump " \
+         "does not exist"
+   elif [ -z "$OPT_DATABASES" -a -z "$OPT_ALL_DATABASES" ]; then
+      echo "Specify --databases or --all-databases to dump and summarize schemas"
    else
-      echo "Skipping schema analysis"
+      echo "Skipping schema analysis due to apparent error in dump file"
    fi
 
    # ########################################################################

=== modified file 't/lib/bash/report_mysql_info.sh'
--- t/lib/bash/report_mysql_info.sh	2012-12-06 00:10:22 +0000
+++ t/lib/bash/report_mysql_info.sh	2013-12-12 05:50:47 +0000
@@ -715,6 +715,7 @@
 OPT_SLEEP=1
 OPT_DATABASES=""
 OPT_READ_SAMPLES=""
+OPT_ALL_DATABASES=""
 NAME_VAL_LEN=25
 report_mysql_summary "$samples/tempdir" | tail -n+3 > "$PT_TMPDIR/got"
 no_diff "$PT_TMPDIR/got" "$samples/expected_result_report_summary.txt"

=== modified file 't/pt-mysql-summary/pt-mysql-summary.t'
--- t/pt-mysql-summary/pt-mysql-summary.t	2012-12-07 18:52:33 +0000
+++ t/pt-mysql-summary/pt-mysql-summary.t	2013-12-12 05:50:47 +0000
@@ -66,12 +66,12 @@
       no_diff(
          sub {
             local $ENV{_NO_FALSE_NEGATIVES} = 1;
-            print `$env $trunk/bin/$tool --read-samples $trunk/t/pt-mysql-summary/samples/temp00$i  -- --defaults-file=/tmp/12345/my.sandbox.cnf | tail -n+3 | perl -wlnpe 's/Skipping schema analysis.*/Skipping schema analysis/'`
+            print `$env $trunk/bin/$tool --read-samples $trunk/t/pt-mysql-summary/samples/temp00$i  -- --defaults-file=/tmp/12345/my.sandbox.cnf | tail -n+3 | perl -wlnpe 's/Skipping schema analysis.*/Specify --databases or --all-databases to dump and summarize schemas/'`
          },
          "t/pt-mysql-summary/samples/expected_output_temp00$i.txt",
       ),
       "--read-samples works for t/pt-mysql-summary/temp00$i",
-   );
+   ) or diag($test_diff);
 }
 
 # Test that --help works under sh

=== modified file 't/pt-mysql-summary/samples/expected_output_temp003.txt'
--- t/pt-mysql-summary/samples/expected_output_temp003.txt	2012-11-27 22:05:45 +0000
+++ t/pt-mysql-summary/samples/expected_output_temp003.txt	2013-12-12 05:50:47 +0000
@@ -108,7 +108,7 @@
                     Usage | 0%
          HitToInsertRatio | 0%
 # Schema #####################################################
-Skipping schema analysis
+Specify --databases or --all-databases to dump and summarize schemas
 # Noteworthy Technologies ####################################
                       SSL | No
      Explicit LOCK TABLES | No

=== modified file 't/pt-mysql-summary/samples/expected_output_temp004.txt'
--- t/pt-mysql-summary/samples/expected_output_temp004.txt	2012-11-27 22:05:45 +0000
+++ t/pt-mysql-summary/samples/expected_output_temp004.txt	2013-12-12 05:50:47 +0000
@@ -107,7 +107,7 @@
                     Usage | 0%
          HitToInsertRatio | 0%
 # Schema #####################################################
-Skipping schema analysis
+Specify --databases or --all-databases to dump and summarize schemas
 # Noteworthy Technologies ####################################
                       SSL | No
      Explicit LOCK TABLES | No