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

add nil check for curTs -- some tests don't have chain state

Browse Source
This commit is contained in:
vyzo 2020-12-01 17:56:22 +02:00
parent 3912694fb7
commit facdc555b1
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chain/store/splitstore/splitstore.go
View File

@ -134,6 +134,11 @@ func (s *SplitStore) GetSize(cid cid.Cid) (int, error) {
func (s *SplitStore) Put(blk blocks.Block) error {
s.mx.Lock()
if s.curTs == nil {
s.mx.Unlock()
return s.cold.Put(blk)
}
epoch := s.curTs.Height()
s.mx.Unlock()
@ -147,16 +152,21 @@ func (s *SplitStore) Put(blk blocks.Block) error {
}
func (s *SplitStore) PutMany(blks []blocks.Block) error {
s.mx.Lock()
if s.curTs == nil {
s.mx.Unlock()
return s.cold.PutMany(blks)
}
epoch := s.curTs.Height()
s.mx.Unlock()
err := s.hot.PutMany(blks)
if err != nil {
log.Errorf("error tracking CIDs in hotstore: %s; falling back to coldstore", err)
return s.cold.PutMany(blks)
}
s.mx.Lock()
epoch := s.curTs.Height()
s.mx.Unlock()
batch := make([]cid.Cid, 0, len(blks))
for _, blk := range blks {
batch = append(batch, blk.Cid())
@ -228,6 +238,11 @@ func (s *SplitStore) Start(cs *store.ChainStore) error {
s.baseEpoch = bytesToEpoch(bs)
case dstore.ErrNotFound:
if s.curTs == nil {
// this can happen in some tests
break
}
err = s.setBaseEpoch(s.curTs.Height())
if err != nil {
return err