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

pkg/pdutil(ticdc): fix a deadlock issue #7219

Merged
merged 3 commits into from
Sep 26, 2022
Merged

pkg/pdutil(ticdc): fix a deadlock issue #7219

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69406c2
pkg/pdutil(ticdc): fix a dead lock issue
Rustin170506 Sep 26, 2022
6c01797
Merge branch 'master' into rustin-patch-pkg-dead-lock
Rustin170506 Sep 26, 2022
ded4468
Merge branch 'master' into rustin-patch-pkg-dead-lock
ti-chi-bot Sep 26, 2022
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 pkg/pdutil/clock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type clock struct {
sync.RWMutex
// The time encoded in PD ts.
tsEventTime time.Time
// The time we receives PD ts.
// The time we receive PD ts.
tsProcessingTime time.Time
err error
}
Expand Down Expand Up @@ -120,8 +120,8 @@ func (c *clock) CurrentTime() (time.Time, error) {
// Stop clock.
func (c *clock) Stop() {
c.mu.Lock()
defer c.mu.Unlock()
c.cancel()
c.mu.Unlock()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add a unit test

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this will fix that unstable test. So I don't think we need to add a new test.

<-c.stopCh
}

Expand Down