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

[release-16.0] Flaky tests: Fix race in memory topo (#13559) #13576

Merged
merged 1 commit into from
Jul 27, 2023
Merged

[release-16.0] Flaky tests: Fix race in memory topo (#13559) #13576

Show file tree
Hide file tree
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: 1 addition & 3 deletions go/vt/topo/memorytopo/election.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ func (mp *cLeaderParticipation) WaitForNewLeader(ctx context.Context) (<-chan st
}

notifications := make(chan string, 8)
watchIndex := nextWatchIndex
nextWatchIndex++
n.watches[watchIndex] = watch{lock: notifications}
watchIndex := n.addWatch(watch{lock: notifications})

if n.lock != nil {
notifications <- n.lockContents
Expand Down
18 changes: 14 additions & 4 deletions go/vt/topo/memorytopo/memorytopo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ const (
UnreachableServerAddr = "unreachable"
)

var (
nextWatchIndex = 0
)

// Factory is a memory-based implementation of topo.Factory. It
// takes a file-system like approach, with directories at each level
// being an actual directory node. This is meant to be closer to
Expand Down Expand Up @@ -206,6 +202,20 @@ func (n *node) propagateRecursiveWatch(ev *topo.WatchDataRecursive) {
}
}

var (
nextWatchIndex = 0
nextWatchIndexMu sync.Mutex
)

func (n *node) addWatch(w watch) int {
nextWatchIndexMu.Lock()
defer nextWatchIndexMu.Unlock()
watchIndex := nextWatchIndex
nextWatchIndex++
n.watches[watchIndex] = w
return watchIndex
}

// PropagateWatchError propagates the given error to all watches on this node
// and recursively applies to all children
func (n *node) PropagateWatchError(err error) {
Expand Down
8 changes: 2 additions & 6 deletions go/vt/topo/memorytopo/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ func (c *Conn) Watch(ctx context.Context, filePath string) (*topo.WatchData, <-c
}

notifications := make(chan *topo.WatchData, 100)
watchIndex := nextWatchIndex
nextWatchIndex++
n.watches[watchIndex] = watch{contents: notifications}
watchIndex := n.addWatch(watch{contents: notifications})

go func() {
<-ctx.Done()
Expand Down Expand Up @@ -105,9 +103,7 @@ func (c *Conn) WatchRecursive(ctx context.Context, dirpath string) ([]*topo.Watc
})

notifications := make(chan *topo.WatchDataRecursive, 100)
watchIndex := nextWatchIndex
nextWatchIndex++
n.watches[watchIndex] = watch{recursive: notifications}
watchIndex := n.addWatch(watch{recursive: notifications})

go func() {
defer close(notifications)
Expand Down