Skip to content

tm: minor logging fix #6564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepthi merged 1 commit into from
Aug 13, 2020
Merged

tm: minor logging fix #6564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions go/vt/vttablet/tabletmanager/replmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ const (
// the tabletserver state. This will ensure that replication is fixed
// upfront, allowing tabletserver to start off healthy.
type replManager struct {
ctx context.Context
tm *TabletManager
markerFile string
ticks *timer.Timer
firstFailure bool
ctx context.Context
tm *TabletManager
markerFile string
ticks *timer.Timer
failed bool

// replStopped is tri-state.
// A nil value signifies that the value is not set.
Expand Down Expand Up @@ -113,20 +113,20 @@ func (rm *replManager) checkActionLocked() {
}
}

if rm.firstFailure {
if !rm.failed {
log.Infof("Replication is stopped, reconnecting to master.")
}
ctx, cancel := context.WithTimeout(rm.ctx, 5*time.Second)
defer cancel()
if err := rm.tm.repairReplication(ctx); err != nil {
if rm.firstFailure {
rm.firstFailure = false
if !rm.failed {
rm.failed = true
log.Infof("Failed to reconnect to master: %v, will keep retrying.", err)
}
return
}
log.Info("Successfully reconnected to master.")
rm.firstFailure = true
rm.failed = false
}

// setReplicationStopped performs a best effort attempt of
Expand Down