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

fix(chainwatch): Restore IncomingBlockSync listening

Browse Source
This commit is contained in:
Mike Greenberg 2020-08-31 22:46:28 -04:00
parent 95a75daf9f
commit 7290431cb0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/lotus-chainwatch/syncer/blockssub.go
View File

@ -11,16 +11,17 @@ import (
func (s *Syncer) subBlocks(ctx context.Context) { func (s *Syncer) subBlocks(ctx context.Context) {
sub, err := s.node.SyncIncomingBlocks(ctx) sub, err := s.node.SyncIncomingBlocks(ctx)
if err != nil { if err != nil {
log.Error(err) log.Errorf("opening incoming block channel: %+v", err)
return return
} }
log.Infow("Capturing incoming blocks")
for bh := range sub { for bh := range sub {
err := s.storeHeaders(map[cid.Cid]*types.BlockHeader{ err := s.storeHeaders(map[cid.Cid]*types.BlockHeader{
bh.Cid(): bh, bh.Cid(): bh,
}, false, time.Now()) }, false, time.Now())
if err != nil { if err != nil {
log.Errorf("%+v", err) log.Errorf("storing incoming block header: %+v", err)
} }
} }
} }

14
cmd/lotus-chainwatch/syncer/sync.go
View File

@ -160,11 +160,8 @@ func (s *Syncer) Start(ctx context.Context) {
log.Fatal(err) log.Fatal(err)
} }
// continue to keep the block headers table up to date. // capture all reported blocks
notifs, err := s.node.ChainNotify(ctx) go s.subBlocks(ctx)
if err != nil {
log.Fatal(err)
}
// we need to ensure that on a restart we don't reprocess the whole flarping chain // we need to ensure that on a restart we don't reprocess the whole flarping chain
var sinceEpoch uint64 var sinceEpoch uint64
@ -177,6 +174,13 @@ func (s *Syncer) Start(ctx context.Context) {
sinceEpoch = uint64(height) sinceEpoch = uint64(height)
} }
} }
// continue to keep the block headers table up to date.
notifs, err := s.node.ChainNotify(ctx)
if err != nil {
log.Fatal(err)
}
go func() { go func() {
for notif := range notifs { for notif := range notifs {
for _, change := range notif { for _, change := range notif {