Skip to content

Commit 7d875b4

Browse files
author
Shlomi Noach
authored
Merge pull request #518 from jsoref/spelling
Spelling
2 parents 82b7f2a + 15b8d57 commit 7d875b4

14 files changed

Lines changed: 34 additions & 34 deletions

doc/command-line-flags.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The `--dml-batch-size` flag controls the size of the batched write. Allowed valu
8282

8383
Why is this behavior configurable? Different workloads have different characteristics. Some workloads have very large writes, such that aggregating even `50` writes into a transaction makes for a significant transaction size. On other workloads write rate is high such that one just can't allow for a hundred more syncs to disk per second. The default value of `10` is a modest compromise that should probably work very well for most workloads. Your mileage may vary.
8484

85-
Noteworthy is that setting `--dml-batch-size` to higher value _does not_ mean `gh-ost` blocks or waits on writes. The batch size is an upper limit on transaction size, not a minimal one. If `gh-ost` doesn't have "enough" events in the pipe, it does not wait on the binary log, it just writes what it already has. This conveniently suggests that if write load is light enough for `gh-ost` to only see a few events in the binary log at a given time, then it is also light neough for `gh-ost` to apply a fraction of the batch size.
85+
Noteworthy is that setting `--dml-batch-size` to higher value _does not_ mean `gh-ost` blocks or waits on writes. The batch size is an upper limit on transaction size, not a minimal one. If `gh-ost` doesn't have "enough" events in the pipe, it does not wait on the binary log, it just writes what it already has. This conveniently suggests that if write load is light enough for `gh-ost` to only see a few events in the binary log at a given time, then it is also light enough for `gh-ost` to apply a fraction of the batch size.
8686

8787
### exact-rowcount
8888

@@ -151,7 +151,7 @@ See also: [`concurrent-migrations`](cheatsheet.md#concurrent-migrations) on the
151151

152152
### skip-foreign-key-checks
153153

154-
By default `gh-ost` verifies no foreign keys exist on the migrated table. On servers with large number of tables this check can take a long time. If you're absolutely certain no foreign keys exist (table does not referenece other table nor is referenced by other tables) and wish to save the check time, provide with `--skip-foreign-key-checks`.
154+
By default `gh-ost` verifies no foreign keys exist on the migrated table. On servers with large number of tables this check can take a long time. If you're absolutely certain no foreign keys exist (table does not reference other table nor is referenced by other tables) and wish to save the check time, provide with `--skip-foreign-key-checks`.
155155

156156
### skip-renamed-columns
157157

doc/interactive-commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Both interfaces may serve at the same time. Both respond to simple text command,
4343

4444
### Querying for data
4545

46-
For commands that accept an argumetn as value, pass `?` (question mark) to _get_ current value rather than _set_ a new one.
46+
For commands that accept an argument as value, pass `?` (question mark) to _get_ current value rather than _set_ a new one.
4747

4848
### Examples
4949

doc/understanding-output.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ Initial output lines may look like this:
2424
2016-05-19 17:57:11 INFO connection validated on 127.0.0.1:3306
2525
2016-05-19 17:57:11 INFO rotate to next log name: mysql-bin.002587
2626
2016-05-19 17:57:11 INFO connection validated on 127.0.0.1:3306
27-
2016-05-19 17:57:11 INFO Droppping table `mydb`.`_mytable_gst`
27+
2016-05-19 17:57:11 INFO Dropping table `mydb`.`_mytable_gst`
2828
2016-05-19 17:57:11 INFO Table dropped
29-
2016-05-19 17:57:11 INFO Droppping table `mydb`.`_mytable_old`
29+
2016-05-19 17:57:11 INFO Dropping table `mydb`.`_mytable_old`
3030
2016-05-19 17:57:11 INFO Table dropped
3131
2016-05-19 17:57:11 INFO Creating ghost table `mydb`.`_mytable_gst`
3232
2016-05-19 17:57:11 INFO Ghost table created
3333
2016-05-19 17:57:11 INFO Altering ghost table `mydb`.`_mytable_gst`
3434
2016-05-19 17:57:11 INFO Ghost table altered
35-
2016-05-19 17:57:11 INFO Droppping table `mydb`.`_mytable_osc`
35+
2016-05-19 17:57:11 INFO Dropping table `mydb`.`_mytable_osc`
3636
2016-05-19 17:57:11 INFO Table dropped
3737
2016-05-19 17:57:11 INFO Creating changelog table `mydb`.`_mytable_osc`
3838
2016-05-19 17:57:11 INFO Changelog table created

doc/why-triggerless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Use of triggers simplifies a lot of the flow in doing a live table migration, bu
1616

1717
Triggers are stored routines which are invoked on a per-row operation upon `INSERT`, `DELETE`, `UPDATE` on a table.
1818
They were introduced in MySQL `5.0`.
19-
A trigger may contain a set of queries, and these queries run in the same transaction space as the query that manipulates the table. This makes for an atomicy of both the original operation on the table and the trigger-invoked operations.
19+
A trigger may contain a set of queries, and these queries run in the same transaction space as the query that manipulates the table. This makes for an atomicity of both the original operation on the table and the trigger-invoked operations.
2020

2121
### Triggers, overhead
2222

go/binlog/gomysql_reader.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ func NewGoMySQLReader(connectionConfig *mysql.ConnectionConfig) (binlogReader *G
5757
// ConnectBinlogStreamer
5858
func (this *GoMySQLReader) ConnectBinlogStreamer(coordinates mysql.BinlogCoordinates) (err error) {
5959
if coordinates.IsEmpty() {
60-
return log.Errorf("Emptry coordinates at ConnectBinlogStreamer()")
60+
return log.Errorf("Empty coordinates at ConnectBinlogStreamer()")
6161
}
6262

6363
this.currentCoordinates = coordinates
6464
log.Infof("Connecting binlog streamer at %+v", this.currentCoordinates)
65-
// Start sync with sepcified binlog file and position
65+
// Start sync with specified binlog file and position
6666
this.binlogStreamer, err = this.binlogSyncer.StartSync(gomysql.Position{this.currentCoordinates.LogFile, uint32(this.currentCoordinates.LogPos)})
6767

6868
return err
@@ -114,7 +114,7 @@ func (this *GoMySQLReader) handleRowsEvent(ev *replication.BinlogEvent, rowsEven
114114
}
115115
}
116116
// The channel will do the throttling. Whoever is reding from the channel
117-
// decides whether action is taken sycnhronously (meaning we wait before
117+
// decides whether action is taken synchronously (meaning we wait before
118118
// next iteration) or asynchronously (we keep pushing more events)
119119
// In reality, reads will be synchronous
120120
entriesChannel <- binlogEntry

go/cmd/gh-ost/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func main() {
4646
migrationContext := base.GetMigrationContext()
4747

4848
flag.StringVar(&migrationContext.InspectorConnectionConfig.Key.Hostname, "host", "127.0.0.1", "MySQL hostname (preferably a replica, not the master)")
49-
flag.StringVar(&migrationContext.AssumeMasterHostname, "assume-master-host", "", "(optional) explicitly tell gh-ost the identity of the master. Format: some.host.com[:port] This is useful in master-master setups where you wish to pick an explicit master, or in a tungsten-replicator where gh-ost is unabel to determine the master")
49+
flag.StringVar(&migrationContext.AssumeMasterHostname, "assume-master-host", "", "(optional) explicitly tell gh-ost the identity of the master. Format: some.host.com[:port] This is useful in master-master setups where you wish to pick an explicit master, or in a tungsten-replicator where gh-ost is unable to determine the master")
5050
flag.IntVar(&migrationContext.InspectorConnectionConfig.Key.Port, "port", 3306, "MySQL port (preferably a replica, not the master)")
5151
flag.StringVar(&migrationContext.CliUser, "user", "", "MySQL user")
5252
flag.StringVar(&migrationContext.CliPassword, "password", "", "MySQL password")

go/logic/applier.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func (this *Applier) dropTable(tableName string) error {
213213
sql.EscapeName(this.migrationContext.DatabaseName),
214214
sql.EscapeName(tableName),
215215
)
216-
log.Infof("Droppping table %s.%s",
216+
log.Infof("Dropping table %s.%s",
217217
sql.EscapeName(this.migrationContext.DatabaseName),
218218
sql.EscapeName(tableName),
219219
)
@@ -380,7 +380,7 @@ func (this *Applier) ReadMigrationRangeValues() error {
380380
// CalculateNextIterationRangeEndValues reads the next-iteration-range-end unique key values,
381381
// which will be used for copying the next chunk of rows. Ir returns "false" if there is
382382
// no further chunk to work through, i.e. we're past the last chunk and are done with
383-
// itrating the range (and this done with copying row chunks)
383+
// iterating the range (and this done with copying row chunks)
384384
func (this *Applier) CalculateNextIterationRangeEndValues() (hasFurtherRange bool, err error) {
385385
this.migrationContext.MigrationIterationRangeMinValues = this.migrationContext.MigrationIterationRangeMaxValues
386386
if this.migrationContext.MigrationIterationRangeMinValues == nil {

go/logic/inspect.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func (this *Inspector) validateConnection() error {
202202
}
203203

204204
// validateGrants verifies the user by which we're executing has necessary grants
205-
// to do its thang.
205+
// to do its thing.
206206
func (this *Inspector) validateGrants() error {
207207
query := `show /* gh-ost */ grants for current_user()`
208208
foundAll := false
@@ -261,7 +261,7 @@ func (this *Inspector) validateGrants() error {
261261

262262
// restartReplication is required so that we are _certain_ the binlog format and
263263
// row image settings have actually been applied to the replication thread.
264-
// It is entriely possible, for example, that the replication is using 'STATEMENT'
264+
// It is entirely possible, for example, that the replication is using 'STATEMENT'
265265
// binlog format even as the variable says 'ROW'
266266
func (this *Inspector) restartReplication() error {
267267
log.Infof("Restarting replication on %s:%d to make sure binlog settings apply to replication thread", this.connectionConfig.Key.Hostname, this.connectionConfig.Key.Port)
@@ -377,7 +377,7 @@ func (this *Inspector) validateLogSlaveUpdates() error {
377377
}
378378

379379
if this.migrationContext.InspectorIsAlsoApplier() {
380-
log.Warningf("log_slave_updates not found on %s:%d, but executing directly on master, so I'm proceeeding", this.connectionConfig.Key.Hostname, this.connectionConfig.Key.Port)
380+
log.Warningf("log_slave_updates not found on %s:%d, but executing directly on master, so I'm proceeding", this.connectionConfig.Key.Hostname, this.connectionConfig.Key.Port)
381381
return nil
382382
}
383383

go/logic/migrator.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (this *Migrator) canStopStreaming() bool {
179179

180180
// onChangelogStateEvent is called when a binlog event operation on the changelog table is intercepted.
181181
func (this *Migrator) onChangelogStateEvent(dmlEvent *binlog.BinlogDMLEvent) (err error) {
182-
// Hey, I created the changlog table, I know the type of columns it has!
182+
// Hey, I created the changelog table, I know the type of columns it has!
183183
if hint := dmlEvent.NewColumnValues.StringColumn(2); hint != "state" {
184184
return nil
185185
}
@@ -387,7 +387,7 @@ func (this *Migrator) ExecOnFailureHook() (err error) {
387387

388388
func (this *Migrator) handleCutOverResult(cutOverError error) (err error) {
389389
if this.migrationContext.TestOnReplica {
390-
// We're merly testing, we don't want to keep this state. Rollback the renames as possible
390+
// We're merely testing, we don't want to keep this state. Rollback the renames as possible
391391
this.applier.RenameTablesRollback()
392392
}
393393
if cutOverError == nil {
@@ -742,7 +742,7 @@ func (this *Migrator) initiateStatus() error {
742742
// printMigrationStatusHint prints a detailed configuration dump, that is useful
743743
// to keep in mind; such as the name of migrated table, throttle params etc.
744744
// This gets printed at beginning and end of migration, every 10 minutes throughout
745-
// migration, and as reponse to the "status" interactive command.
745+
// migration, and as response to the "status" interactive command.
746746
func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
747747
w := io.MultiWriter(writers...)
748748
fmt.Fprintln(w, fmt.Sprintf("# Migrating %s.%s; Ghost table is %s.%s",
@@ -820,7 +820,7 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
820820
}
821821
}
822822

823-
// printStatus prints the prgoress status, and optionally additionally detailed
823+
// printStatus prints the progress status, and optionally additionally detailed
824824
// dump of configuration.
825825
// `rule` indicates the type of output expected.
826826
// By default the status is written to standard output, but other writers can

go/logic/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ sup # Print a short status message
147147
coordinates # Print the currently inspected coordinates
148148
chunk-size=<newsize> # Set a new chunk-size
149149
dml-batch-size=<newsize> # Set a new dml-batch-size
150-
nice-ratio=<ratio> # Set a new nice-ratio, immediate sleep after each row-copy operation, float (examples: 0 is agrressive, 0.7 adds 70% runtime, 1.0 doubles runtime, 2.0 triples runtime, ...)
150+
nice-ratio=<ratio> # Set a new nice-ratio, immediate sleep after each row-copy operation, float (examples: 0 is aggressive, 0.7 adds 70% runtime, 1.0 doubles runtime, 2.0 triples runtime, ...)
151151
critical-load=<load> # Set a new set of max-load thresholds
152152
max-lag-millis=<max-lag> # Set a new replication lag threshold
153153
replication-lag-query=<query> # Set a new query that determines replication lag (no quotes)
@@ -305,8 +305,8 @@ help # This message
305305
return NoPrintStatusRule, err
306306
}
307307
if arg != "" && arg != this.migrationContext.OriginalTableName {
308-
// User exlpicitly provided table name. This is a courtesy protection mechanism
309-
err := fmt.Errorf("User commanded 'unpostpone' on %s, but migrated table is %s; ingoring request.", arg, this.migrationContext.OriginalTableName)
308+
// User explicitly provided table name. This is a courtesy protection mechanism
309+
err := fmt.Errorf("User commanded 'unpostpone' on %s, but migrated table is %s; ignoring request.", arg, this.migrationContext.OriginalTableName)
310310
return NoPrintStatusRule, err
311311
}
312312
if atomic.LoadInt64(&this.migrationContext.IsPostponingCutOver) > 0 {

0 commit comments

Comments
 (0)