From a8aac7f6b3d8166c92df1144c5d17247b8e9cbb3 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Sat, 9 Mar 2013 11:47:10 -0700 Subject: [PATCH] Alphabetize pt-mysql-summary and pt-stalk options. --- bin/pt-mysql-summary | 74 ++++++++++++++++++++-------------------- bin/pt-stalk | 80 ++++++++++++++++++++++---------------------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary index 98466e53..834512cc 100755 --- a/bin/pt-mysql-summary +++ b/bin/pt-mysql-summary @@ -2525,7 +2525,7 @@ pt-mysql-summary - Summarize MySQL information nicely. =head1 SYNOPSIS -Usage: pt-mysql-summary [OPTIONS] [-- MYSQL OPTIONS] +Usage: pt-mysql-summary [OPTIONS] pt-mysql-summary conveniently summarizes the status and configuration of a MySQL database server so that you can learn about it at a glance. It is not @@ -2620,24 +2620,24 @@ unlike the system date and time printed earlier, so you can see whether the database and operating system times match. # Processlist ################################################ - + Command COUNT(*) Working SUM(Time) MAX(Time) ------------------------------ -------- ------- --------- --------- Binlog Dump 1 1 150000 150000 Query 1 1 0 0 - + User COUNT(*) Working SUM(Time) MAX(Time) ------------------------------ -------- ------- --------- --------- msandbox 2 2 150000 150000 - + Host COUNT(*) Working SUM(Time) MAX(Time) ------------------------------ -------- ------- --------- --------- localhost 2 2 150000 150000 - + db COUNT(*) Working SUM(Time) MAX(Time) ------------------------------ -------- ------- --------- --------- NULL 2 2 150000 150000 - + State COUNT(*) Working SUM(Time) MAX(Time) ------------------------------ -------- ------- --------- --------- Master has sent all binlog to 1 1 150000 150000 @@ -2730,22 +2730,22 @@ are fuzzy-rounded. 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 performance_schema 17 sakila 16 7 3 6 3 22 - + Database MyISAM CSV PERFORMANCE_SCHEMA InnoDB mysql 22 2 performance_schema 17 sakila 8 15 - + Database BTREE FULLTEXT mysql 31 performance_schema sakila 63 1 - + c t s e l d i t m v s h i e n o a n i e a m a m t u n t t n d r a @@ -2952,22 +2952,6 @@ type: string Read this comma-separated list of config files. If specified, this must be the first option on the command line. -=item --help - -Print help and exit. - -=item --save-samples - -type: string - -Save the data files used to generate the summary in this directory. - -=item --read-samples - -type: string - -Create a report from the files found in this directory. - =item --databases type: string @@ -2976,16 +2960,6 @@ 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. -=item --sleep - -type: int; default: 10 - -Seconds to sleep when gathering status counters. - -=item --version - -Print tool's version and exit. - =item --defaults-file short form: -F; type: string @@ -2993,6 +2967,10 @@ short form: -F; type: string Only read mysql options from the given file. You must give an absolute pathname. +=item --help + +Print help and exit. + =item --host short form: -h; type: string @@ -3011,6 +2989,24 @@ short form: -P; type: int Port number to use for connection. +=item --read-samples + +type: string + +Create a report from the files found in this directory. + +=item --save-samples + +type: string + +Save the data files used to generate the summary in this directory. + +=item --sleep + +type: int; default: 10 + +Seconds to sleep when gathering status counters. + =item --socket short form: -S; type: string @@ -3023,10 +3019,14 @@ short form: -u; type: string User for login if not current user. +=item --version + +Print tool's version and exit. + =back =head1 ENVIRONMENT - + This tool does not use any environment variables. =head1 SYSTEM REQUIREMENTS diff --git a/bin/pt-stalk b/bin/pt-stalk index 6d916814..43dc4fcf 100755 --- a/bin/pt-stalk +++ b/bin/pt-stalk @@ -1474,12 +1474,12 @@ pt-stalk - Gather forensic data about MySQL when a problem occurs. =head1 SYNOPSIS -Usage: pt-stalk [OPTIONS] [-- EXTRA MYSQL OPTIONS] +Usage: pt-stalk [OPTIONS] pt-stalk watches for a trigger condition to become true, and then collects data -to help in diagnosing problems. It is designed to run as a daemon with root +to help in diagnosing problems. It is designed to run as a daemon with root privileges, so that you can diagnose intermittent problems that you cannot -observe directly. You can also use it to execute a custom command, or to gather +observe directly. You can also use it to execute a custom command, or to gather the data on demand without waiting for the trigger to happen. =head1 RISKS @@ -1648,6 +1648,13 @@ to fire when the problem recovers quickly. Daemonize the tool. This causes the tool to fork into the background and log its output as specified in --log. +=item --defaults-file + +short form: -F; type: string + +Only read mysql options from the given file. You must give an absolute +pathname. + =item --dest type: string; default: /var/lib/pt-stalk @@ -1744,6 +1751,12 @@ plugin-specific global variables with "PLUGIN_" or make them local. Print help and exit. +=item --host + +short form: -h; type: string + +Host to connect to. + =item --interval type: int; default: 1 @@ -1777,6 +1790,12 @@ type: string Send mail to this list of addresses when data is collected. +=item --password + +short form: -p; type: string + +Password to use when connecting. + =item --pid type: string; default: /var/run/pt-stalk.pid @@ -1847,6 +1866,12 @@ Plugins can stop the tool by setting the global variable C to C<1>. In this case, the global variable C should also be set to indicate why the tool was stopped. +=item --port + +short form: -P; type: int + +Port number to use for connection. + =item --prefix type: string @@ -1892,6 +1917,12 @@ continuously, which might be a problem if the collection process is intrusive. It also prevents filling up the disk or gathering too much data to analyze reasonably. +=item --socket + +short form: -S; type: string + +Socket file to use for connection. + =item --stalk default: yes; negatable: yes @@ -1915,6 +1946,12 @@ type: int; default: 25 The threshold at which the diagnostic trigger should fire. See L<"--function"> for details. +=item --user + +short form: -u; type: string + +User for login if not current user. + =item --variable type: string; default: Threads_running @@ -1941,43 +1978,6 @@ want to use a higher verbosity level. Print tool's version and exit. -=item --defaults-file - -short form: -F; type: string - -Only read mysql options from the given file. You must give an absolute -pathname. - -=item --host - -short form: -h; type: string - -Host to connect to. - -=item --password - -short form: -p; type: string - -Password to use when connecting. - -=item --port - -short form: -P; type: int - -Port number to use for connection. - -=item --socket - -short form: -S; type: string - -Socket file to use for connection. - -=item --user - -short form: -u; type: string - -User for login if not current user. - =back =head1 ENVIRONMENT