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

computing szPurge leads to deadlock and unneeded, remove

Browse Source
This commit is contained in:
zenground0 2023-03-08 17:51:59 -07:00
parent e5553554d1
commit ee9ff563d2
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
blockstore/splitstore/splitstore.go
View File

@ -211,7 +211,6 @@ type SplitStore struct {
// protected by compaction lock // protected by compaction lock
szWalk int64 szWalk int64
szProtectedTxns int64 szProtectedTxns int64
szToPurge int64 // expected purges before critical section protections and live marking
szKeys int64 // approximate, not counting keys protected when entering critical section szKeys int64 // approximate, not counting keys protected when entering critical section
// protected by txnLk // protected by txnLk

18
blockstore/splitstore/splitstore_compact.go
View File

@ -648,7 +648,7 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
defer purgew.Close() //nolint:errcheck defer purgew.Close() //nolint:errcheck
// some stats for logging // some stats for logging
var hotCnt, coldCnt, purgeCnt, szPurge int var hotCnt, coldCnt, purgeCnt int64
err = s.hot.ForEachKey(func(c cid.Cid) error { err = s.hot.ForEachKey(func(c cid.Cid) error {
// was it marked? // was it marked?
mark, err := markSet.Has(c) mark, err := markSet.Has(c)
@ -660,16 +660,6 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
hotCnt++ hotCnt++
return nil return nil
} }
sz, err := s.hot.GetSize(s.ctx, c)
if err != nil {
if ipld.IsNotFound(err) {
log.Warnf("hotstore missing expected block %s", c)
return nil
}
return xerrors.Errorf("error retrieving block %s from hotstore: %w", c, err)
}
szPurge += sz
// it needs to be removed from hot store, mark it as candidate for purge // it needs to be removed from hot store, mark it as candidate for purge
if err := purgew.Write(c); err != nil { if err := purgew.Write(c); err != nil {
@ -709,9 +699,8 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
log.Infow("cold collection done", "took", time.Since(startCollect)) log.Infow("cold collection done", "took", time.Since(startCollect))
log.Infow("compaction stats", "hot", hotCnt, "cold", coldCnt, "purge", purgeCnt, "purge size", szPurge) log.Infow("compaction stats", "hot", hotCnt, "cold", coldCnt, "purge", purgeCnt)
s.szToPurge = int64(szPurge) s.szKeys = hotCnt * cidKeySize
s.szKeys = int64(hotCnt) * cidKeySize
stats.Record(s.ctx, metrics.SplitstoreCompactionHot.M(int64(hotCnt))) stats.Record(s.ctx, metrics.SplitstoreCompactionHot.M(int64(hotCnt)))
stats.Record(s.ctx, metrics.SplitstoreCompactionCold.M(int64(coldCnt))) stats.Record(s.ctx, metrics.SplitstoreCompactionCold.M(int64(coldCnt)))
@ -1540,7 +1529,6 @@ func (s *SplitStore) clearSizeMeasurements() {
s.szKeys = 0 s.szKeys = 0
s.szMarkedLiveRefs = 0 s.szMarkedLiveRefs = 0
s.szProtectedTxns = 0 s.szProtectedTxns = 0
s.szToPurge = 0
s.szWalk = 0 s.szWalk = 0
} }