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

fix race in cb cache

Browse Source
This commit is contained in:
Alfonso de la Rocha 2022-12-13 12:45:01 +01:00
parent f2cc452d4c
commit 939e515d23
No known key found for this signature in database
GPG Key ID: B7BEF4B895F2B535
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chain/sub/bcast/consistent.go
View File

@ -53,8 +53,16 @@ func (bd *bcastDict) store(key multihash.Multihash, d *blksInfo) {
bd.m.Store(key.String(), d) bd.m.Store(key.String(), d)
} }
func (bd *bcastDict) blkLen(key multihash.Multihash) int {
v, ok := bd.m.Load(key.String())
if !ok {
return 0
}
return len(v.(*blksInfo).blks)
}
type ConsistentBCast struct { type ConsistentBCast struct {
lk sync.Mutex lk sync.RWMutex
delay time.Duration delay time.Duration
// FIXME: Make this a slice??? Less storage but needs indexing logic. // FIXME: Make this a slice??? Less storage but needs indexing logic.
m map[abi.ChainEpoch]*bcastDict m map[abi.ChainEpoch]*bcastDict
@ -95,6 +103,8 @@ func (bInfo *blksInfo) eqErr() error {
} }
func (cb *ConsistentBCast) Len() int { func (cb *ConsistentBCast) Len() int {
cb.lk.RLock()
defer cb.lk.RUnlock()
return len(cb.m) return len(cb.m)
} }
@ -121,7 +131,7 @@ func (cb *ConsistentBCast) RcvBlock(ctx context.Context, blk *types.BlockMsg) {
} }
if !cidExists(bInfo.blks, blkCid) { if !cidExists(bInfo.blks, blkCid) {
bInfo.blks = append(bInfo.blks, blkCid) bcastDict.store(key, &blksInfo{bInfo.ctx, bInfo.cancel, append(bInfo.blks, blkCid)})
log.Errorf("equivocation detected for height %d: %s", blk.Header.Height, bInfo.eqErr()) log.Errorf("equivocation detected for height %d: %s", blk.Header.Height, bInfo.eqErr())
return return
} }
@ -133,7 +143,9 @@ func (cb *ConsistentBCast) RcvBlock(ctx context.Context, blk *types.BlockMsg) {
} }
func (cb *ConsistentBCast) WaitForDelivery(bh *types.BlockHeader) error { func (cb *ConsistentBCast) WaitForDelivery(bh *types.BlockHeader) error {
cb.lk.RLock()
bcastDict := cb.m[bh.Height] bcastDict := cb.m[bh.Height]
cb.lk.RUnlock()
key, err := BCastKey(bh) key, err := BCastKey(bh)
if err != nil { if err != nil {
return err return err
@ -144,7 +156,7 @@ func (cb *ConsistentBCast) WaitForDelivery(bh *types.BlockHeader) error {
} }
// Wait for the timeout // Wait for the timeout
<-bInfo.ctx.Done() <-bInfo.ctx.Done()
if len(bInfo.blks) > 1 { if bcastDict.blkLen(key) > 1 {
return fmt.Errorf("equivocation detected for epoch %d. Two blocks being broadcast with same VRFProof", bh.Height) return fmt.Errorf("equivocation detected for epoch %d. Two blocks being broadcast with same VRFProof", bh.Height)
} }
return nil return nil