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

fix lint

Browse Source
This commit is contained in:
vyzo 2022-01-30 15:43:52 +02:00
parent 20b75022aa
commit 7931f1f8f9
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockstore/splitstore/markset_map.go
View File

@ -60,7 +60,7 @@ func (e *MapMarkSetEnv) Recover(name string) (MarkSet, error) {
if err != nil { if err != nil {
return nil, xerrors.Errorf("error opening markset file for read: %w", err) return nil, xerrors.Errorf("error opening markset file for read: %w", err)
} }
defer in.Close() defer in.Close() //nolint:errcheck
// wrap a buffered reader to make this faster // wrap a buffered reader to make this faster
buf := bufio.NewReader(in) buf := bufio.NewReader(in)

6
blockstore/splitstore/markset_test.go
View File

@ -317,7 +317,7 @@ func testMarkSetVisitorRecovery(t *testing.T, lsType string) {
t.Fatal(err) t.Fatal(err)
} }
visitor, err = env.Recover("test") _, err = env.Recover("test")
if err == nil { if err == nil {
t.Fatal("expected recovery to fail") t.Fatal("expected recovery to fail")
} }
@ -430,7 +430,7 @@ func testMarkSetRecovery(t *testing.T, lsType string) {
t.Fatal(err) t.Fatal(err)
} }
markSet, err = env.Recover("test") _, err = env.Recover("test")
if err == nil { if err == nil {
t.Fatal("expected recovery to fail") t.Fatal("expected recovery to fail")
} }
@ -537,7 +537,7 @@ func testMarkSetMarkMany(t *testing.T, lsType string) {
t.Fatal(err) t.Fatal(err)
} }
markSet, err = env.Recover("test") _, err = env.Recover("test")
if err == nil { if err == nil {
t.Fatal("expected recovery to fail") t.Fatal("expected recovery to fail")
} }

2
blockstore/splitstore/splitstore.go
View File

@ -208,7 +208,7 @@ func Open(path string, ds dstore.Datastore, hot, cold bstore.Blockstore, cfg *Co
if ss.checkpointExists() { if ss.checkpointExists() {
log.Info("found compaction checkpoint; resuming compaction") log.Info("found compaction checkpoint; resuming compaction")
if err := ss.completeCompaction(); err != nil { if err := ss.completeCompaction(); err != nil {
markSetEnv.Close() markSetEnv.Close() //nolint:errcheck
return nil, xerrors.Errorf("error resuming compaction: %w", err) return nil, xerrors.Errorf("error resuming compaction: %w", err)
} }
} }

12
blockstore/splitstore/splitstore_compact.go
View File

@ -58,8 +58,6 @@ var (
const ( const (
batchSize = 16384 batchSize = 16384
defaultColdPurgeSize = 7_000_000
) )
func (s *SplitStore) HeadChange(_, apply []*types.TipSet) error { func (s *SplitStore) HeadChange(_, apply []*types.TipSet) error {
@ -497,7 +495,9 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
} }
// it's cold, mark it as candidate for move // it's cold, mark it as candidate for move
coldw.Write(c) if err := coldw.Write(c); err != nil {
return xerrors.Errorf("error writing cid to coldstore: %w", err)
}
coldCnt++ coldCnt++
return nil return nil
@ -942,7 +942,7 @@ func (s *SplitStore) has(c cid.Cid) (bool, error) {
func (s *SplitStore) moveColdBlocks(coldr *ColdSetReader) error { func (s *SplitStore) moveColdBlocks(coldr *ColdSetReader) error {
batch := make([]blocks.Block, 0, batchSize) batch := make([]blocks.Block, 0, batchSize)
coldr.ForEach(func(c cid.Cid) error { err := coldr.ForEach(func(c cid.Cid) error {
if err := s.checkClosing(); err != nil { if err := s.checkClosing(); err != nil {
return err return err
} }
@ -969,6 +969,10 @@ func (s *SplitStore) moveColdBlocks(coldr *ColdSetReader) error {
return nil return nil
}) })
if err != nil {
return xerrors.Errorf("error iterating coldset: %w", err)
}
if len(batch) > 0 { if len(batch) > 0 {
err := s.cold.PutMany(s.ctx, batch) err := s.cold.PutMany(s.ctx, batch)
if err != nil { if err != nil {