Skip to content

Fix Race Condition: Watch Misses Deletion Event Near Compaction Boundary #6

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
wilfredkiehn3xx wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

Fix Race Condition: Watch Misses Deletion Event Near Compaction Boundary #6

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
15 changes: 15 additions & 0 deletions server/storage/mvcc/watchable_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,18 @@ func (s *watchableStore) syncWatchers() int {

return len(s.unsynced.watchers)
}

func (s *watchableStore) compact(rev int64) {
s.Mu.Lock()
defer s.Mu.Unlock()
s.store.compact(rev)
for w := range s.unsynced.watchers {
if w.minRev <= rev {
select {
case w.ch <- WatchResponse{WatchID: w.id, CompactRevision: rev}:
default:
}
delete(s.unsynced.watchers, w)
}
}
}
6 changes: 5 additions & 1 deletion server/storage/mvcc/watchable_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@ func TestConcurrentCompactionAndWatch(t *testing.T) {

// Simulate concurrent compaction and watch creation
ch := make(chan WatchResponse, 1)
compactDone := make(chan struct{})
go func() {
time.Sleep(10 * time.Millisecond)
st.compact(5)
store.compact(5)
close(compactDone)
}()

_, err := store.watch([]byte("foo"), nil, 5, 1, ch)
if err == nil {
// Wait for compaction to complete
<-compactDone
// If watch creation succeeded, syncWatchers should catch it if compaction has progressed
store.syncWatchers()
select {
Expand Down