cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

test: attempt to make the splitstore test deterministic

Browse Source 
At a minimum, make it thread-safe.
This commit is contained in:
Steven Allen 2021-03-08 16:15:55 -08:00
parent c49c6fd514
commit 6d2e8d721d
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
blockstore/splitstore/splitstore_test.go
View File

@ -14,6 +14,7 @@ import (
cid "github.com/ipfs/go-cid" cid "github.com/ipfs/go-cid"
datastore "github.com/ipfs/go-datastore" datastore "github.com/ipfs/go-datastore"
dssync "github.com/ipfs/go-datastore/sync"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
) )
@ -25,8 +26,6 @@ func init() {
} }
func testSplitStore(t *testing.T, cfg *Config) { func testSplitStore(t *testing.T, cfg *Config) {
t.Helper()
chain := &mockChain{} chain := &mockChain{}
// genesis // genesis
genBlock := mock.MkBlock(nil, 0, 0) genBlock := mock.MkBlock(nil, 0, 0)
@ -34,7 +33,7 @@ func testSplitStore(t *testing.T, cfg *Config) {
chain.push(genTs) chain.push(genTs)
// the myriads of stores // the myriads of stores
ds := datastore.NewMapDatastore() ds := dssync.MutexWrap(datastore.NewMapDatastore())
hot := blockstore.NewMemorySync() hot := blockstore.NewMemorySync()
cold := blockstore.NewMemorySync() cold := blockstore.NewMemorySync()
@ -61,6 +60,8 @@ func testSplitStore(t *testing.T, cfg *Config) {
t.Fatal(err) t.Fatal(err)
} }
//time.Sleep(time.Second)
// make some tipsets, but not enough to cause compaction // make some tipsets, but not enough to cause compaction
mkBlock := func(curTs *types.TipSet, i int) *types.TipSet { mkBlock := func(curTs *types.TipSet, i int) *types.TipSet {
blk := mock.MkBlock(curTs, uint64(i), uint64(i)) blk := mock.MkBlock(curTs, uint64(i), uint64(i))
@ -93,10 +94,13 @@ func testSplitStore(t *testing.T, cfg *Config) {
curTs := genTs curTs := genTs
for i := 1; i < 5; i++ { for i := 1; i < 5; i++ {
curTs = mkBlock(curTs, i) curTs = mkBlock(curTs, i)
time.Sleep(time.Second)
} }
mkGarbageBlock(genTs, 1) mkGarbageBlock(genTs, 1)
time.Sleep(time.Second)
// count objects in the cold and hot stores // count objects in the cold and hot stores
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
@ -117,11 +121,11 @@ func testSplitStore(t *testing.T, cfg *Config) {
hotCnt := countBlocks(hot) hotCnt := countBlocks(hot)
if coldCnt != 1 { if coldCnt != 1 {
t.Fatalf("expected %d blocks, but got %d", 1, coldCnt) t.Errorf("expected %d blocks, but got %d", 5, coldCnt)
} }
if hotCnt != 4 { if hotCnt != 5 {
t.Fatalf("expected %d blocks, but got %d", 4, hotCnt) t.Errorf("expected %d blocks, but got %d", 5, hotCnt)
} }
// trigger a compaction // trigger a compaction
@ -135,31 +139,31 @@ func testSplitStore(t *testing.T, cfg *Config) {
if !cfg.EnableFullCompaction { if !cfg.EnableFullCompaction {
if coldCnt != 5 { if coldCnt != 5 {
t.Fatalf("expected %d cold blocks, but got %d", 5, coldCnt) t.Errorf("expected %d cold blocks, but got %d", 5, coldCnt)
} }
if hotCnt != 5 { if hotCnt != 5 {
t.Fatalf("expected %d hot blocks, but got %d", 5, hotCnt) t.Errorf("expected %d hot blocks, but got %d", 5, hotCnt)
} }
} }
if cfg.EnableFullCompaction && !cfg.EnableGC { if cfg.EnableFullCompaction && !cfg.EnableGC {
if coldCnt != 3 { if coldCnt != 3 {
t.Fatalf("expected %d cold blocks, but got %d", 3, coldCnt) t.Errorf("expected %d cold blocks, but got %d", 3, coldCnt)
} }
if hotCnt != 7 { if hotCnt != 7 {
t.Fatalf("expected %d hot blocks, but got %d", 7, hotCnt) t.Errorf("expected %d hot blocks, but got %d", 7, hotCnt)
} }
} }
if cfg.EnableFullCompaction && cfg.EnableGC { if cfg.EnableFullCompaction && cfg.EnableGC {
if coldCnt != 2 { if coldCnt != 2 {
t.Fatalf("expected %d cold blocks, but got %d", 2, coldCnt) t.Errorf("expected %d cold blocks, but got %d", 2, coldCnt)
} }
if hotCnt != 7 { if hotCnt != 7 {
t.Fatalf("expected %d hot blocks, but got %d", 7, hotCnt) t.Errorf("expected %d hot blocks, but got %d", 7, hotCnt)
} }
} }
} }