Skip to content
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

Jump to bottom

fix deadlock while drainer.Syncer panic (#806) #807

Merged
merged 1 commit into from
Nov 14, 2019
Merged

fix deadlock while drainer.Syncer panic (#806) #807

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
4 changes: 2 additions & 2 deletions drainer/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ func (s *Syncer) savePoint(ts, slaveTS int64) {
}

func (s *Syncer) run() error {
defer close(s.closed)

wait := make(chan struct{})

fakeBinlogCh := make(chan *pb.Binlog, 1024)
Expand Down Expand Up @@ -422,8 +424,6 @@ ForLoop:
panic("Waiting too long for `Syncer.run` to quit.")
}

close(s.closed)

// return the origin error if has, or the close error
if err != nil {
return err
Expand Down