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

better logging plus moving some code around

Browse Source
This commit is contained in:
vyzo 2021-02-27 18:47:13 +02:00
parent 2f26026991
commit 2426ffb277
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,11 +346,14 @@ func (s *SplitStore) compact() {
} }
func (s *SplitStore) compactSimple() { func (s *SplitStore) compactSimple() {
// some stats for logging s.mx.Lock()
var stHot, stCold int curTs := s.curTs
s.mx.Unlock()
coldEpoch := s.baseEpoch + CompactionCold coldEpoch := s.baseEpoch + CompactionCold
cold := make(map[cid.Cid]struct{})
log.Infof("running simple compaction; currentEpoch: %d baseEpoch: %d coldEpoch: %d",
curTs.Height(), s.baseEpoch, coldEpoch)
coldSet, err := s.env.NewLiveSet("cold") coldSet, err := s.env.NewLiveSet("cold")
if err != nil { if err != nil {
@ -360,13 +363,9 @@ func (s *SplitStore) compactSimple() {
defer coldSet.Close() //nolint:errcheck defer coldSet.Close() //nolint:errcheck
// 1. mark reachable cold objects by looking at the objects reachable only from the cold epoch // 1. mark reachable cold objects by looking at the objects reachable only from the cold epoch
log.Infof("marking reachable cold objects") log.Info("marking reachable cold objects")
startMark := time.Now() startMark := time.Now()
s.mx.Lock()
curTs := s.curTs
s.mx.Unlock()
coldTs, err := s.cs.GetTipsetByHeight(context.Background(), coldEpoch, curTs, true) coldTs, err := s.cs.GetTipsetByHeight(context.Background(), coldEpoch, curTs, true)
if err != nil { if err != nil {
// TODO do something better here // TODO do something better here
@ -389,6 +388,11 @@ func (s *SplitStore) compactSimple() {
log.Info("collecting cold objects") log.Info("collecting cold objects")
startCollect := time.Now() startCollect := time.Now()
cold := make(map[cid.Cid]struct{})
// some stats for logging
var stHot, stCold int
err = s.snoop.ForEach(func(cid cid.Cid, wrEpoch abi.ChainEpoch) error { err = s.snoop.ForEach(func(cid cid.Cid, wrEpoch abi.ChainEpoch) error {
// is the object stil hot? // is the object stil hot?
if wrEpoch > coldEpoch { if wrEpoch > coldEpoch {
@ -488,7 +492,17 @@ func (s *SplitStore) compactSimple() {
} }
func (s *SplitStore) compactFull() { func (s *SplitStore) compactFull() {
// create two on disk live sets, one for marking the cold finality region s.mx.Lock()
curTs := s.curTs
s.mx.Unlock()
epoch := curTs.Height()
coldEpoch := s.baseEpoch + CompactionCold
log.Infof("running full compaction; currentEpoch: %d baseEpoch: %d coldEpoch: %d",
curTs.Height(), s.baseEpoch, coldEpoch)
// create two live sets, one for marking the cold finality region
// and one for marking the hot region // and one for marking the hot region
hotSet, err := s.env.NewLiveSet("hot") hotSet, err := s.env.NewLiveSet("hot")
if err != nil { if err != nil {
@ -509,12 +523,6 @@ func (s *SplitStore) compactFull() {
startMark := time.Now() startMark := time.Now()
// Phase 1a: mark all reachable CIDs in the hot range // Phase 1a: mark all reachable CIDs in the hot range
s.mx.Lock()
curTs := s.curTs
s.mx.Unlock()
epoch := curTs.Height()
coldEpoch := s.baseEpoch + CompactionCold
err = s.cs.WalkSnapshot(context.Background(), curTs, epoch-coldEpoch, s.skipOldMsgs, s.skipMsgReceipts, err = s.cs.WalkSnapshot(context.Background(), curTs, epoch-coldEpoch, s.skipOldMsgs, s.skipMsgReceipts,
func(cid cid.Cid) error { func(cid cid.Cid) error {
return hotSet.Mark(cid) return hotSet.Mark(cid)