Skip to content

mvcc: synchronize watch progress notifications with event stream #21517

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

Open
James3014 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mvcc: synchronize watch progress notifications with event stream #21517

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
7 changes: 3 additions & 4 deletions server/storage/mvcc/watchable_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,15 +515,11 @@ func (s *watchableStore) progressIfSync(watchers map[WatchID]*watcher, responseW
s.mu.RLock()
defer s.mu.RUnlock()

rev := s.rev()
// Any watcher unsynced?
for _, w := range watchers {
if _, ok := s.synced.watchers[w]; !ok {
return false
}
if rev < w.startRev {
return false
}
}

// If all watchers are synchronised, send out progress
Expand All @@ -532,6 +528,9 @@ func (s *watchableStore) progressIfSync(watchers map[WatchID]*watcher, responseW
// notification will be broadcasted client-side if required
// (see dispatchEvent in client/v3/watch.go)
for _, w := range watchers {
// Use the watcher's minRev - 1 to ensure that we don't send a progress
// notification for a revision that hasn't been notified yet via notify().
rev := w.minRev - 1
w.send(WatchResponse{WatchID: responseWatchID, Revision: rev})
return true
}
Expand Down