Skip to content

Commit 6b42e73

Browse files
author
Shlomi Noach
committed
Merge branch 'master' into local-tests
redundencying the UTC path
2 parents ec7f641 + 1021a83 commit 6b42e73

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/interactive-commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Both interfaces may serve at the same time. Both respond to simple text command,
2424
- `critical-load=<load>`: change critical load setting (exceeding given thresholds causes panic and abort)
2525
- `nice-ratio=<ratio>`: change _nice_ ratio: 0 for aggressive (not nice, not sleeping), positive integer `n`: for any `1ms` spent copying rows, spend `n*1ms` units of time sleeping. Examples: assume a single rows chunk copy takes `100ms` to complete. `nice-ratio=0.5` will cause `gh-ost` to sleep for `50ms` immediately following. `nice-ratio=1` will cause `gh-ost` to sleep for `100ms`, effectively doubling runtime; value of `2` will effectively triple the runtime; etc.
2626
- `throttle-query`: change throttle query
27-
- `throttle-control-replicas`: change list of throttle-control replicas, these are replicas `gh-ost` will check
27+
- `throttle-control-replicas='replica1,replica2'`: change list of throttle-control replicas, these are replicas `gh-ost` will check. This takes a comma separated list of replica's to check and replaces the previous list.
2828
- `throttle`: force migration suspend
2929
- `no-throttle`: cancel forced suspension (though other throttling reasons may still apply)
3030
- `unpostpone`: at a time where `gh-ost` is postponing the [cut-over](cut-over.md) phase, instruct `gh-ost` to stop postponing and proceed immediately to cut-over.

go/logic/migrator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ func (this *Migrator) Migrate() (err error) {
387387
return err
388388
}
389389

390-
log.Debugf("Waiting for tables to be in place")
390+
log.Infof("Waiting for tables to be in place")
391391
<-this.tablesInPlace
392392
log.Debugf("Tables are in place")
393393
// Yay! We now know the Ghost and Changelog tables are good to examine!

0 commit comments

Comments
 (0)