Browse Source

storage: Remove race condition from TestLoop

pull/2400/head
beorn7 8 years ago
parent
commit
752fac60ae
  1. 7
      storage/local/storage_test.go

7
storage/local/storage_test.go

@ -840,10 +840,15 @@ func TestLoop(t *testing.T) {
storage.Append(s) storage.Append(s)
} }
storage.WaitForIndexing() storage.WaitForIndexing()
series, _ := storage.fpToSeries.get(model.Metric{}.FastFingerprint()) fp := model.Metric{}.FastFingerprint()
series, _ := storage.fpToSeries.get(fp)
storage.fpLocker.Lock(fp)
cdsBefore := len(series.chunkDescs) cdsBefore := len(series.chunkDescs)
storage.fpLocker.Unlock(fp)
time.Sleep(fpMaxWaitDuration + time.Second) // TODO(beorn7): Ugh, need to wait for maintenance to kick in. time.Sleep(fpMaxWaitDuration + time.Second) // TODO(beorn7): Ugh, need to wait for maintenance to kick in.
storage.fpLocker.Lock(fp)
cdsAfter := len(series.chunkDescs) cdsAfter := len(series.chunkDescs)
storage.fpLocker.Unlock(fp)
storage.Stop() storage.Stop()
if cdsBefore <= cdsAfter { if cdsBefore <= cdsAfter {
t.Errorf( t.Errorf(

Loading…
Cancel
Save