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

test: Fix flaky TestCloseThroughContext test #1265

Merged
merged 3 commits into from
Mar 31, 2023
Merged

test: Fix flaky TestCloseThroughContext test #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55e1bb0
Add sleep to allow cancel to close the db
AndrewSisley Mar 30, 2023
a5abd9d
Remove read from chan
AndrewSisley Mar 30, 2023
737f291
PR FIXUP - Move close of closing chan to within lock
AndrewSisley Mar 31, 2023
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
12 changes: 5 additions & 7 deletions datastore/memory/memory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ type Datastore struct {
inFlightTxn *btree.BTreeG[dsTxn]
commit chan commit

closing chan struct{}
closed bool
closeLk sync.RWMutex
closeOnce sync.Once
closing chan struct{}
closed bool
closeLk sync.RWMutex
}

var _ ds.Datastore = (*Datastore)(nil)
Expand Down Expand Up @@ -117,15 +116,14 @@ func (d *Datastore) newBasicBatch() ds.Batch {
}

func (d *Datastore) Close() error {
d.closeOnce.Do(func() {
close(d.closing)
})
d.closeLk.Lock()
defer d.closeLk.Unlock()
if d.closed {
return ErrClosed
}

d.closed = true
close(d.closing)
close(d.commit)
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion datastore/memory/memory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestCloseThroughContext(t *testing.T) {

cancel()

<-s.closing
time.Sleep(time.Millisecond * 10)

err := s.Close()
require.ErrorIs(t, err, ErrClosed)
Expand Down