diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 01b78c09..9a40c241 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ - [ ] The contributed code is licensed under GPL v2.0 - [ ] Contributor Licence Agreement (CLA) is signed - [ ] util/update-modules has been ran -- [ ] Documention updated +- [ ] Documentation updated - [ ] Test suite update diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md index 7db35949..42acb1ad 100644 --- a/CONTRIBUTE.md +++ b/CONTRIBUTE.md @@ -74,7 +74,7 @@ git push origin PT-9999_functionality_name ``` And then go to the web UI to create the new pull request (PR) based off of this new branch. -## Submiting Fixes +## Submitting Fixes ### Pull Requests Once your fix is ready and you pushed it into the feature branch, open a pull request with the code. Be sure you’ve read any documents on contributing, understand the license and have signed a [Contributor Licence Agreement (CLA)](https://github.com/percona/percona-toolkit/blob/3.x/CONTRIBUTING.md). Once you’ve submitted a pull request, the maintainers can compare your branch to the existing one and decide whether or not to incorporate (merge) your changes. @@ -92,12 +92,12 @@ Once your fix is ready and you pushed it into the feature branch, open a pull re Once you’ve opened a pull request, a discussion will start around your proposed changes. Other contributors and users may chime in, but ultimately the decision is made by the maintainers. You may be asked to make some changes to your pull request, if so, add more commits to your branch and push them – they’ll automatically go into the existing pull request. ## Licensing -Along with the pull request, include a message indicating that the submited code is your own creation and it can be distributed under the GPL2 licence. +Along with the pull request, include a message indicating that the submitted code is your own creation and it can be distributed under the GPL2 licence. ## Setting up the Development Environment and Testing ### Perl and Shell Tools -For testing, we are going to need to have MySQL with replicas. For that, we already have scripts in the sandbox directory but first we need to download MySQL binaries. Please download the Linux Generic tar file for your distrubution from [https://www.percona.com/downloads/Percona-Server-LATEST/](https://www.percona.com/downloads/Percona-Server-LATEST/). +For testing, we are going to need to have MySQL with replicas. For that, we already have scripts in the sandbox directory but first we need to download MySQL binaries. Please download the Linux Generic tar file for your distribution from [https://www.percona.com/downloads/Percona-Server-LATEST/](https://www.percona.com/downloads/Percona-Server-LATEST/). #### Set up MySQL Sandbox In this example, we are going to download Percona Server 8.0.26-17. diff --git a/Changelog b/Changelog index 3accb3eb..efb86704 100644 --- a/Changelog +++ b/Changelog @@ -104,7 +104,7 @@ v3.4.0 release 2022-07-11 * Fixed bug PT-1747: pt-online-schema-change: metadata lock can break database for rebuild_constraints * Fixed bug PT-1887: pt-diskstat is not working for new kernels * Fixed bug PT-1900: At times, pt-query-digest does not hide the parameters properly when parameter=binary - * Fixed bug PT-1953: pt-summary typo: Memory mamagement. + * Fixed bug PT-1953: pt-summary typo: Memory management. * Fixed bug PT-1959: go part of the toolkit still has the version 3.3.0 * Fixed bug PT-1965: pt-stalk --mysql-only doesn't collect mysqladmin output (Thanks Sergey Kuzmichev) * Fixed bug PT-1966: Test no_drop_no_swap for the pt-online-schema-change is broken (Thanks Tsubasa Tanaka) @@ -136,7 +136,7 @@ v3.3.0 release 2021-01-14 * Fixed bug PT-1829: pt-heartbeat doesn't reconnect for check-read-only * Improvement PT-1836: Review and consider lintian reported issues * Improvement PT-1851: Backslashes missing from documentation - * Improvement PT-1853: Added --no-check-foreing-keys to pt-osc + * Improvement PT-1853: Added --no-check-foreign-keys to pt-osc * Fixed bug PT-1857: pt-heartbeat cannot reconnect. * Fixed bug PT-1859: pt-pg-summary fails for Postgres12 (Thanks Sergey Kuzmichev) * Fixed bug PT-1881: pt-upgrade fails when query including format strings and SQL errors is given (Thanks Nayuta Yanagisawa) @@ -395,7 +395,7 @@ v2.2.17 released 2016-03-07 * Fixed bug 1523730: pt-show-grants doesn't sort column-level privileges * Fixed bug 1362942: pt-slave-restart fails on MariaDB 10.0.13 (gtid_mode confusion) * Fixed bug PT-30 : pt-stalk: new var binlog_error_action causes bug in collect module - * Fixed bug 1389041: pt-table-checksum has high likelyhood to skip a table when row count is around chunk-size * chunk-size-limit + * Fixed bug 1389041: pt-table-checksum has high likelihood to skip a table when row count is around chunk-size * chunk-size-limit * Fixed bug 1480719: pt-table-checksum redundant argument in printf v2.2.16 released 2015-11-09 @@ -427,7 +427,7 @@ v2.2.15 released 2015-08-28 * Fixed bug 1457573: pt-sift failed when fetching missing tools * Feature 1488600: pt-stalk monitors tokudb status * Fixed bug 1042727: pt-table-checksum doesn't reconnect to slaves when timed out on very long lags - * Fixed bug 1277049: passsword parameter must escape commas - all tools [DOC] + * Fixed bug 1277049: password parameter must escape commas - all tools [DOC] * Fixed bug BLD-271: changes needed to build packages from git tree * Fixed bug PT-21 : write-user-docs script stopped working after switching to github * Fixed bug 1488611: testing bugs related to newer perl versions @@ -860,7 +860,7 @@ v2.1.2 released 2012-06-12 * Fixed bug 978432: pt-table-checksum ignoring primary key * Fixed bug 995274: pt-table-checksum can't use an undefined value as an ARRAY reference at line 2206 * Fixed bug 996110: pt-table-checksum crashes if InnoDB is disabled - * Fixed bug 987393: pt-table-checksum: Empy tables cause "undefined value as an ARRAY" errors + * Fixed bug 987393: pt-table-checksum: Empty tables cause "undefined value as an ARRAY" errors * Fixed bug 997155: pt-table-sync sets binlog_format needlessly * Fixed bug 1002365: pt-table-sync --ignore-* options don't work with --replicate * Fixed bug 1003014: pt-table-sync --replicate and --sync-to-master error "index does not exist" diff --git a/config/NaturalDocs/Topics.txt b/config/NaturalDocs/Topics.txt index 905270f0..3a45bb32 100644 --- a/config/NaturalDocs/Topics.txt +++ b/config/NaturalDocs/Topics.txt @@ -24,7 +24,7 @@ Format: 1.52 # Alter Topic Type: [name] # Creates a new topic type or alters one from the main file. Each type gets # its own index and behavior settings. Its name can have letters, numbers, -# spaces, and these charaters: - / . ' +# spaces, and these characters: - / . ' # # Plural: [name] # Sets the plural name of the topic type, if different. diff --git a/config/deb/changelog b/config/deb/changelog index c933ada6..a930cfd8 100644 --- a/config/deb/changelog +++ b/config/deb/changelog @@ -192,7 +192,7 @@ percona-toolkit (2.2.17-1) unstable; urgency=low * Fixed bug 1523730: pt-show-grants doesn't sort column-level privileges * Fixed bug 1362942: pt-slave-restart fails on MariaDB 10.0.13 (gtid_mode confusion) * Fixed bug PT-30: pt-stalk: new var binlog_error_action causes bug in collect module - * Fixed bug 1389041: pt-table-checksum has high likelyhood to skip a table when row count is around chunk-size * chunk-size-limit + * Fixed bug 1389041: pt-table-checksum has high likelihood to skip a table when row count is around chunk-size * chunk-size-limit * Fixed bug 1480719: pt-table-checksum redundant argument in printf -- Percona Toolkit Developers Fri, 04 Mar 2016 12:09:54 +0000 @@ -228,7 +228,7 @@ percona-toolkit (2.2.15-2) unstable; urgency=low * Fixed bug 1457573: pt-sift failed when fetching missing tools * Feature 1488600: pt-stalk monitors tokudb status * Fixed bug 1042727: pt-table-checksum doesn't reconnect to slaves when timed out on very long lags - * Fixed bug 1277049: passsword parameter must escape commas - all tools [DOC] + * Fixed bug 1277049: password parameter must escape commas - all tools [DOC] * Fixed bug BLD-271: changes needed to build packages from git tree * Fixed bug PT-21 : write-user-docs script stopped working after switching to github * Fixed bug 1488611: testing bugs related to newer perl versions @@ -684,7 +684,7 @@ percona-toolkit (2.1.2) unstable; urgency=low * Fixed bug 978432: pt-table-checksum ignoring primary key * Fixed bug 995274: pt-table-checksum can't use an undefined value as an ARRAY reference at line 2206 * Fixed bug 996110: pt-table-checksum crashes if InnoDB is disabled - * Fixed bug 987393: pt-table-checksum: Empy tables cause "undefined value as an ARRAY" errors + * Fixed bug 987393: pt-table-checksum: Empty tables cause "undefined value as an ARRAY" errors * Fixed bug 1002365: pt-table-sync --ignore-* options don't work with --replicate * Fixed bug 1003014: pt-table-sync --replicate and --sync-to-master error "index does not exist" * Fixed bug 823403: pt-table-sync --lock-and-rename doesn't work on 5.1 diff --git a/docs/pt-mongodb-query-digest.rst b/docs/pt-mongodb-query-digest.rst index a33bb7ed..33edaa63 100644 --- a/docs/pt-mongodb-query-digest.rst +++ b/docs/pt-mongodb-query-digest.rst @@ -60,7 +60,7 @@ Options Specifies the sorting order using fields: ``count``, ``ratio``, ``query-time``, ``docs-scanned``, ``docs-returned``. - Adding a hypen (``-``) in front of a field denotes reverse order. + Adding a hyphen (``-``) in front of a field denotes reverse order. For example: ``--order-by="count,-ratio"``. ``-p``, ``--password`` diff --git a/docs/pt-secure-collect.rst b/docs/pt-secure-collect.rst index 1c53c413..64748fb9 100644 --- a/docs/pt-secure-collect.rst +++ b/docs/pt-secure-collect.rst @@ -93,7 +93,7 @@ COMMANDS .. option:: --encrypt-password - Encrypt the output file using this password. If ommited, it will be asked + Encrypt the output file using this password. If omitted, it will be asked in the command line. .. option:: --no-collect @@ -131,7 +131,7 @@ COMMANDS .. option:: --outfile - Write the output to this file. If ommited, the output file + Write the output to this file. If omitted, the output file name will be the same as the input file, adding the ``.aes`` extension. * **Encrypt command** @@ -144,7 +144,7 @@ COMMANDS .. option:: --outfile - Write the output to this file. If ommited, the output file + Write the output to this file. If omitted, the output file name will be the same as the input file, without the ``.aes`` extension. * **Sanitize command** diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 764389ef..0b1f339d 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -880,7 +880,7 @@ Changelog * Fixed bug 1523730: pt-show-grants doesn't sort column-level privileges * Fixed bug 1362942: pt-slave-restart fails on MariaDB 10.0.13 (gtid_mode confusion) * Fixed bug PT-30 : pt-stalk: new var binlog_error_action causes bug in collect module -* Fixed bug 1389041: pt-table-checksum has high likelyhood to skip a table when row count is around chunk-size * chunk-size-limit +* Fixed bug 1389041: pt-table-checksum has high likelihood to skip a table when row count is around chunk-size * chunk-size-limit * Fixed bug 1480719: pt-table-checksum redundant argument in printf v2.2.16 released 2015-11-09 @@ -945,7 +945,7 @@ v2.2.15 released 2015-08-28 Before, the tool would die if any slave connection was lost. Now the tool waits forever for slaves. -* 1056507: ``pt-archiver --check-slave-lag`` agressiveness +* 1056507: ``pt-archiver --check-slave-lag`` aggressiveness The tool now checks replication lag every 100 rows instead of every row, which significantly improves efficiency. @@ -961,7 +961,7 @@ v2.2.15 released 2015-08-28 When comparing table size with the slave table, the tool now ignores ``--chunk-size-limit`` if it is set to zero to avoid multiplying by zero. -* 1443763: Update documentation and/or implentation of ``pt-archiver --check-interval`` +* 1443763: Update documentation and/or implementation of ``pt-archiver --check-interval`` Fixed the documentation for ``--check-interval`` to reflect its correct behavior. @@ -1121,7 +1121,7 @@ Bugs Fixed: * Fixed bug 1269695: pt-online-schema-change documentation now contains more information about limitations on why it isn't running ``ALTER TABLE`` for a table which has only a non-unique index. -* Fixed bug 1328686: Running pt-hearbeat with --check-read-only option would cause an error when running on server with ``read_only`` option. Tool now waits for server ``read_only`` status to be disabled before starting to run. +* Fixed bug 1328686: Running pt-heartbeat with --check-read-only option would cause an error when running on server with ``read_only`` option. Tool now waits for server ``read_only`` status to be disabled before starting to run. * Fixed bug 1373937: pt-table-checksum now supports ``none`` as valid ``--recursion-method`` when using with Percona XtraDB Cluster. @@ -1211,7 +1211,7 @@ Bugs Fixed: * Fixed bug 1258135: pt-deadlock-logger was inserting older deadlocks into the ``deadlock`` table even if it was already there creating unnecessary noise. For example, if the deadlock happened 1 year ago, and MySQL keeps it in the memory and pt-deadlock-logger would ``INSERT`` it into ``percona.deadlocks`` table every minute all the time until server was restarted. This was fixed by comparing with the last deadlock fingerprint before issuing the ``INSERT`` query. -* Fixed bug 1329422: pt-online-schema-change foreign-keys-method=none can break FK constraints in a way that is hard to recover from. Allthough this method of handling foreign key constraints is provided so that the database administrator can disable the tool's built-in functionality if desired, a warning and confirmation request when using alter-foreign-keys-method "none" has been added to warn users when using this option. +* Fixed bug 1329422: pt-online-schema-change foreign-keys-method=none can break FK constraints in a way that is hard to recover from. Although this method of handling foreign key constraints is provided so that the database administrator can disable the tool's built-in functionality if desired, a warning and confirmation request when using alter-foreign-keys-method "none" has been added to warn users when using this option. Changelog --------- @@ -1232,7 +1232,7 @@ New Features: * pt-agent has been replaced by percona-agent. More information on percona-agent can be found in the `Introducing the 3-Minute MySQL Monitor `_ blogpost. * pt-slave-restart now supports MySQL 5.6 global transaction IDs. -* pt-table-checkum now has new --plugin option which is similar to pt-online-schema-change --plugin +* pt-table-checksum now has new --plugin option which is similar to pt-online-schema-change --plugin Bugs Fixed: @@ -1450,7 +1450,7 @@ v2.2.2 released 2013-04-24 Percona Toolkit 2.2.2 has been released. This is the second release of the 2.2 series and aims to fix bugs in the previous release and provide -usability enhacements to the toolkit. +usability enhancements to the toolkit. Users may note the revival of the --show-all option in pt-query-digest. This had been removed in 2.2.1, but resulted in too much output in @@ -2187,7 +2187,7 @@ Changelog * Fixed bug 978432: pt-table-checksum ignoring primary key * Fixed bug 995274: pt-table-checksum can't use an undefined value as an ARRAY reference at line 2206 * Fixed bug 996110: pt-table-checksum crashes if InnoDB is disabled -* Fixed bug 987393: pt-table-checksum: Empy tables cause "undefined value as an ARRAY" errors +* Fixed bug 987393: pt-table-checksum: Empty tables cause "undefined value as an ARRAY" errors * Fixed bug 1002365: pt-table-sync --ignore-* options don't work with --replicate * Fixed bug 1003014: pt-table-sync --replicate and --sync-to-master error "index does not exist" * Fixed bug 823403: pt-table-sync --lock-and-rename doesn't work on 5.1 diff --git a/sandbox/start-sandbox b/sandbox/start-sandbox index 193af117..be827953 100755 --- a/sandbox/start-sandbox +++ b/sandbox/start-sandbox @@ -82,7 +82,7 @@ make_sandbox() { for file in `grep -l PORT ${TMP_DIR}/$port/* 2>/dev/null`; do sed -e "s/PORT/$port/g" -i.bak $file sed -e "s!TMP_DIR!$TMP_DIR!g" -i.bak $file - # Use ! instead of / because the replacment has / (it's a directory) + # Use ! instead of / because the replacement has / (it's a directory) sed -e "s!PERCONA_TOOLKIT_SANDBOX!$PERCONA_TOOLKIT_SANDBOX!g" -i.bak $file sed -e "s!MYSQLD!$mysqld!g" -i.bak $file done @@ -290,7 +290,7 @@ cd $PERCONA_TOOLKIT_BRANCH/sandbox # This script is usually called by test-env which discovers and # sets PERCONA_TOOLKIT_SANDBOX. If this script is called directly, -# then the caller is reponsible for setting PERCONA_TOOLKIT_SANDBOX. +# then the caller is responsible for setting PERCONA_TOOLKIT_SANDBOX. # PERCONA_TOOLKIT_SANDBOX points to a base directory containing the # MySQL executables like PERCONA_TOOLKIT_SANDBOX/bin/mysqld_safe. diff --git a/sandbox/test-env b/sandbox/test-env index a82ee78d..61614bed 100755 --- a/sandbox/test-env +++ b/sandbox/test-env @@ -38,7 +38,7 @@ usage() { err "Usage: test-env start|stop|restart|status|checkconfig|reset|kill" \ "" \ " start Start test servers in ${TMP_DIR}/PORT" \ - " stop Stop test servers and remvoe all ${TMP_DIR}/PORT" \ + " stop Stop test servers and remove all ${TMP_DIR}/PORT" \ " kill Kill test servers (use if stop fails)" \ " restart Stop and start test servers" \ " status Print status of test servers" \ @@ -219,7 +219,7 @@ kill_sandbox() { [ "$pid2" ] && kill -9 $pid2 sleep 2 - # Third and finaly check if the sandbox server is running. + # Third and finally check if the sandbox server is running. sandbox_is_running $p if [ $? -eq 0 ]; then err "Failed to kill MySQL test server on port $p (PID $pid1, $pid2)" diff --git a/src/go/lib/config/config_test.go b/src/go/lib/config/config_test.go index abbf5a54..a09c2db4 100644 --- a/src/go/lib/config/config_test.go +++ b/src/go/lib/config/config_test.go @@ -63,7 +63,7 @@ func TestReadConfig(t *testing.T) { // stringvar=some string var having = and # if got := conf.GetString("stringvar"); got != "some string var having = and #" { - t.Errorf("string var incorect value; got %s", got) + t.Errorf("string var incorrect value; got %s", got) } } @@ -115,12 +115,12 @@ func TestOverrideConfig(t *testing.T) { } if got := conf.GetString("stringvar"); got != "some other string" { - t.Errorf("string var incorect value; got %s", got) + t.Errorf("string var incorrect value; got %s", got) } // This exists only in file2 if got := conf.GetString("newstring"); got != "a new string" { - t.Errorf("string var incorect value; got %s", got) + t.Errorf("string var incorrect value; got %s", got) } if got := conf.GetInt64("anotherint"); got != 8 { diff --git a/src/go/mongolib/fingerprinter/fingerprinter.go b/src/go/mongolib/fingerprinter/fingerprinter.go index b25db266..e45b97b4 100644 --- a/src/go/mongolib/fingerprinter/fingerprinter.go +++ b/src/go/mongolib/fingerprinter/fingerprinter.go @@ -15,7 +15,7 @@ const ( maxDepthLevel = 10 ) -// Fingerprint models the MongnDB query fingeprint result fields. +// Fingerprint models the MongnDB query fingerprint result fields. type Fingerprint struct { Namespace string Operation string diff --git a/src/go/mongolib/proto/bson.go b/src/go/mongolib/proto/bson.go index a093b9ac..c7e5a204 100644 --- a/src/go/mongolib/proto/bson.go +++ b/src/go/mongolib/proto/bson.go @@ -82,7 +82,7 @@ func (d *BsonD) UnmarshalJSON(data []byte) error { return err } if t != json.Delim('}') { - return fmt.Errorf("expect delimeter %s but got %s", json.Delim('}'), t) + return fmt.Errorf("expect delimiter %s but got %s", json.Delim('}'), t) } return nil diff --git a/src/go/mongolib/proto/server_status.go b/src/go/mongolib/proto/server_status.go index c5a881c3..a9608927 100644 --- a/src/go/mongolib/proto/server_status.go +++ b/src/go/mongolib/proto/server_status.go @@ -164,7 +164,7 @@ type NetworkStats struct { NumRequests int64 `bson:"numRequests"` } -// OpcountStats stores information related to comamnds and basic CRUD operations. +// OpcountStats stores information related to commands and basic CRUD operations. type OpcountStats struct { Command int64 `bson:"command"` Delete int64 `bson:"delete"` diff --git a/src/go/pt-k8s-debug-collector/main_test.go b/src/go/pt-k8s-debug-collector/main_test.go index a1122593..50a64aba 100644 --- a/src/go/pt-k8s-debug-collector/main_test.go +++ b/src/go/pt-k8s-debug-collector/main_test.go @@ -43,7 +43,7 @@ func TestIndividualFiles(t *testing.T) { name string cmd []string want []string - preprocesor func(string) string + preprocessor func(string) string }{ { // If the tool collects required log files @@ -51,7 +51,7 @@ func TestIndividualFiles(t *testing.T) { // tar -tf cluster-dump-test.tar.gz --wildcards 'cluster-dump/*/var/lib/mysql/*' cmd: []string{"tar", "-tf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/var/lib/mysql/*"}, want: []string{"auto.cnf", "grastate.dat", "gvwstate.dat", "innobackup.backup.log", "innobackup.move.log", "innobackup.prepare.log", "mysqld-error.log", "mysqld.post.processing.log"}, - preprocesor: func(in string) string { + preprocessor: func(in string) string { files := strings.Split(in, "\n") var result []string for _, f := range files { @@ -70,7 +70,7 @@ func TestIndividualFiles(t *testing.T) { // tar --to-command="grep -m 1 -o Version:" -xzf cluster-dump-test.tar.gz --wildcards 'cluster-dump/*/var/lib/mysql/mysqld-error.log' cmd: []string{"tar", "--to-command", "grep -m 1 -o Version:", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/var/lib/mysql/mysqld-error.log"}, want: []string{"Version:"}, - preprocesor: func(in string) string { + preprocessor: func(in string) string { nl := strings.Index(in, "\n") if nl == -1 { return "" @@ -96,8 +96,8 @@ func TestIndividualFiles(t *testing.T) { if err != nil { t.Errorf("test %s, error running command %s:\n%s\n\nCommand output:\n%s", test.name, test.cmd[0], err.Error(), out) } - if test.preprocesor(bytes.NewBuffer(out).String()) != strings.Join(test.want, "\n") { - t.Errorf("test %s, output is not as expected\nOutput: %s\nWanted: %s", test.name, test.preprocesor(bytes.NewBuffer(out).String()), test.want) + if test.preprocessor(bytes.NewBuffer(out).String()) != strings.Join(test.want, "\n") { + t.Errorf("test %s, output is not as expected\nOutput: %s\nWanted: %s", test.name, test.preprocessor(bytes.NewBuffer(out).String()), test.want) } } } diff --git a/src/go/pt-mongodb-summary/README.rst b/src/go/pt-mongodb-summary/README.rst index bc429358..0d26137a 100644 --- a/src/go/pt-mongodb-summary/README.rst +++ b/src/go/pt-mongodb-summary/README.rst @@ -13,7 +13,7 @@ Binaries -------- Please check the `releases `_ tab to download the binaries. -Paramters +Parameters ^^^^^^^^^ |Short|Long|Default|Description| |-----|----|-------|-----------| diff --git a/src/go/pt-mongodb-summary/main.go b/src/go/pt-mongodb-summary/main.go index 7f23a196..2fb7a209 100644 --- a/src/go/pt-mongodb-summary/main.go +++ b/src/go/pt-mongodb-summary/main.go @@ -937,7 +937,7 @@ func parseFlags() (*cliOptions, error) { ) gop.IntVarLong(&opts.RunningOpsInterval, "running-ops-interval", 'i', - fmt.Sprintf("Interval to wait betwwen running ops samples in milliseconds. Default %d milliseconds", + fmt.Sprintf("Interval to wait between running ops samples in milliseconds. Default %d milliseconds", opts.RunningOpsInterval), ) diff --git a/src/go/pt-pg-summary/main.go b/src/go/pt-pg-summary/main.go index c77d8ab5..20cad1bc 100644 --- a/src/go/pt-pg-summary/main.go +++ b/src/go/pt-pg-summary/main.go @@ -250,7 +250,7 @@ func parseCommandLineOpts(args []string) (cliOptions, error) { app.Flag("username", "User for login if not current user"). Short('U'). StringVar(&opts.connOpts.User) - app.Flag("disable-ssl", "Diable SSL for the connection"). + app.Flag("disable-ssl", "Disable SSL for the connection"). Default("true").BoolVar(&opts.connOpts.DisableSSL) app.Flag("verbose", "Show verbose log"). Default("false").BoolVar(&opts.Verbose) diff --git a/src/go/pt-secure-collect/README.md b/src/go/pt-secure-collect/README.md index 784949ba..7c56b7d4 100644 --- a/src/go/pt-secure-collect/README.md +++ b/src/go/pt-secure-collect/README.md @@ -42,7 +42,7 @@ pt-secure-collect collect |--mysql-password|MySQL password.| |--ask-mysql-pass|Ask MySQL password.| |--extra-cmd|Also run this command as part of the data collection. This parameter can be used more than once.| -|--encrypt-password|Encrypt the output file using this password.
If ommited, it will be asked in the command line.| +|--encrypt-password|Encrypt the output file using this password.
If omitted, it will be asked in the command line.| |--no-collect|Do not collect data| |--no-sanitize|Do not sanitize data| |--no-encrypt|Do not encrypt the output file.| @@ -58,7 +58,7 @@ pt-secure-collect decrypt [flags] ``` |Flag|Description| |-----|------| -|--outfile|Write the output to this file.
If ommited, the output file name will be the same as the input file, adding the `.aes` extension| +|--outfile|Write the output to this file.
If omitted, the output file name will be the same as the input file, adding the `.aes` extension| #### **Encrypt command** @@ -69,7 +69,7 @@ pt-secure-collect encrypt [flags] ``` |Flag|Description| |-----|------| -|--outfile|Write the output to this file.
If ommited, the output file name will be the same as the input file, without the `.aes` extension| +|--outfile|Write the output to this file.
If omitted, the output file name will be the same as the input file, without the `.aes` extension| #### **Sanitize command** diff --git a/src/go/pt-secure-collect/main.go b/src/go/pt-secure-collect/main.go index a9e52618..11c5e8ad 100644 --- a/src/go/pt-secure-collect/main.go +++ b/src/go/pt-secure-collect/main.go @@ -210,11 +210,11 @@ func processCliParams(baseTempPath string, usageWriter io.Writer) (*cliOptions, opts.MySQLUser = opts.CollectCommand.Flag("mysql-user", "MySQL user name.").String() opts.MySQLPass = opts.CollectCommand.Flag("mysql-password", "MySQL password.").String() opts.AskMySQLPass = opts.CollectCommand.Flag("ask-mysql-pass", "Ask MySQL password.").Bool() - // Aditional flags + // Additional flags opts.AdditionalCmds = opts.CollectCommand.Flag("extra-cmd", "Also run this command as part of the data collection. This parameter can be used more than once.").Strings() opts.EncryptPassword = opts.CollectCommand.Flag("encrypt-password", "Encrypt the output file using this password."+ - " If ommited, the file won't be encrypted.").String() + " If omitted, the file won't be encrypted.").String() // No-Flags opts.NoCollect = opts.CollectCommand.Flag("no-collect", "Do not collect data").Bool() opts.NoSanitize = opts.CollectCommand.Flag("no-sanitize", "Sanitize data").Bool() diff --git a/util/build-packages b/util/build-packages index 0a5cdbcf..2661b9b7 100755 --- a/util/build-packages +++ b/util/build-packages @@ -166,7 +166,7 @@ update_version() { echo "OK" echo -n "Updating version in sphinx-build/conf.py... " - # What Sphinx calls verison, we call series; what it calls release we + # What Sphinx calls version, we call series; what it calls release we # call version. cd $SPHINX_CONFIG_DIR sed -i'.bak' -e "s/^version = .*/version = '$SERIES'/" conf.py diff --git a/util/check-tool b/util/check-tool index e55c5554..ea073c53 100755 --- a/util/check-tool +++ b/util/check-tool @@ -157,7 +157,7 @@ sub check_module_usage { Transformers => 1, ); - # Many tools dyanmically instantiate objs like $plugin="WatchStatus", + # Many tools dynamically instantiate objs like $plugin="WatchStatus", # $plugin->new(). So this script can't detect that. my %dynamic = ( 'pt-query-digest' => { diff --git a/util/log-entries b/util/log-entries index ea93bdb3..d38b0539 100755 --- a/util/log-entries +++ b/util/log-entries @@ -2,7 +2,7 @@ version=$1 if [ -z "$version" ]; then - echo "Usage: log-entires VERSION" >&2 + echo "Usage: log-entries VERSION" >&2 echo "Example: cat Changelog | log-entries 1.0.1" >&2 exit 1 fi