octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix output again

Browse Source
This commit is contained in:
Tim Vaillancourt 2022-12-10 00:10:51 +01:00
parent 00b8b48518
commit fd12c49f44
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
go/localtests/tester.go
View File

@ -69,7 +69,7 @@ func (t *Tester) WaitForMySQLAvailable() error {
case <-time.After(5 * time.Minute):
return errors.New("timed out waiting for mysql")
case <-ticker.C:
if err := func() error {
err := func() error {
primaryGTIDExec, err := pingAndGetGTIDExecuted(t.primary, interval)
if err != nil {
return err
@ -83,22 +83,23 @@ func (t *Tester) WaitForMySQLAvailable() error {
return errors.New("replica/primary GTID not equal")
}
return nil
}(); err != nil {
}()
if err != nil {
log.Printf("Waiting for MySQL primary/replica to init: %+v", err)
continue
}
if info, err := getMysqlHostInfo(t.primary); err == nil {
var info *MysqlInfo
if info, err = getMysqlHostInfo(t.primary); err == nil {
log.Printf("MySQL primary %s:%d, version %s (%s) available %s", info.Host, info.Port, info.Version,
info.VersionComment, successEmoji)
}
if info, err := getMysqlHostInfo(t.replica); err == nil {
if info, err = getMysqlHostInfo(t.replica); err == nil {
log.Printf("MySQL replica %s:%d, version %s (%s) available %s", info.Host, info.Port, info.Version,
info.VersionComment, successEmoji)
}
return nil
return err
}
}
}