Skip to content

Commit

Permalink
Merge pull request #17320 from ahrtr/3.5_TestHashKVWhenCompacting_202…
Browse files Browse the repository at this point in the history
…40125

[3.5 test: fix `TestHashKVWhenCompacting`: ensure all goroutine finished
  • Loading branch information
ahrtr authored Jan 25, 2024
2 parents a0ff8e4 + 0f494e0 commit 141232e
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions server/mvcc/kvstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@ func TestHashKVWhenCompacting(t *testing.T) {
hashCompactc := make(chan hashKVResult, 1)
var wg sync.WaitGroup
donec := make(chan struct{})
stopc := make(chan struct{})

// Call HashByRev(10000) in multiple goroutines until donec is closed
for i := 0; i < 10; i++ {
Expand All @@ -563,6 +564,8 @@ func TestHashKVWhenCompacting(t *testing.T) {
t.Error(err)
}
select {
case <-stopc:
return
case <-donec:
return
case hashCompactc <- hashKVResult{hash.Hash, hash.CompactRevision}:
Expand All @@ -586,6 +589,8 @@ func TestHashKVWhenCompacting(t *testing.T) {
}

select {
case <-stopc:
return
case <-donec:
return
default:
Expand All @@ -594,9 +599,20 @@ func TestHashKVWhenCompacting(t *testing.T) {
}()

// Compact the store in a goroutine, using revision 9900 to 10000 and close donec when finished
wg.Add(1)
go func() {
defer close(donec)
defer func() {
close(donec)
wg.Done()
}()

for i := 100; i >= 0; i-- {
select {
case <-stopc:
return
default:
}

_, err := s.Compact(traceutil.TODO(), int64(rev-i))
if err != nil {
t.Error(err)
Expand All @@ -610,10 +626,14 @@ func TestHashKVWhenCompacting(t *testing.T) {

select {
case <-donec:
wg.Wait()
case <-time.After(10 * time.Second):
close(stopc)
wg.Wait()
testutil.FatalStack(t, "timeout")
}

close(stopc)
wg.Wait()
}

// TestHashKVWithCompactedAndFutureRevisions ensures that HashKV returns a correct hash when called
Expand Down

0 comments on commit 141232e

Please sign in to comment.