Skip to content

fix(dot/sync): cleanup logs; don't log case where we fail to get parent while processing #2188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noot merged 3 commits into from
Jan 14, 2022
Merged

fix(dot/sync): cleanup logs; don't log case where we fail to get parent while processing #2188

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75ea8b6
cleanup logs if failed to get parent
noot Jan 12, 2022
11d2509
change other err log to debug
noot Jan 12, 2022
3c0232e
update indents
noot Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions dot/sync/chain_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,19 @@ func (s *chainProcessor) processReadyBlocks() {
}

if err := s.processBlockData(bd); err != nil {
logger.Errorf("block data processing for block with hash %s failed: %s", bd.Hash, err)

// depending on the error, we might want to save this block for later
if errors.Is(err, errFailedToGetParent) {
logger.Tracef("block data processing for block with hash %s failed: %s", bd.Hash, err)
if err := s.pendingBlocks.addBlock(&types.Block{
Header: *bd.Header,
Body: *bd.Body,
}); err != nil {
logger.Debugf("failed to re-add block to pending blocks: %s", err)
}
continue
}

logger.Errorf("block data processing for block with hash %s failed: %s", bd.Hash, err)

@qdm12 qdm12 Jan 13, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit Maybe swap around the condition for less indentation?

Suggested change
if errors.Is(err, errFailedToGetParent) {
logger.Tracef("block data processing for block with hash %s failed: %s", bd.Hash, err)
if err := s.pendingBlocks.addBlock(&types.Block{
Header: *bd.Header,
Body: *bd.Body,
}); err != nil {
logger.Debugf("failed to re-add block to pending blocks: %s", err)
}
continue
}
logger.Errorf("block data processing for block with hash %s failed: %s", bd.Hash, err)
if !errors.Is(err, errFailedToGetParent) {
logger.Errorf("block data processing for block with hash %s failed: %s", bd.Hash, err)
continue
}
logger.Tracef("block data processing for block with hash %s failed: %s", bd.Hash, err)
if err := s.pendingBlocks.addBlock(&types.Block{
Header: *bd.Header,
Body: *bd.Body,
}); err != nil {
logger.Debugf("failed to re-add block to pending blocks: %s", err)
}
}

@noot noot Jan 13, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

}
}
}
Expand Down Expand Up @@ -167,7 +169,7 @@ func (s *chainProcessor) processBlockData(bd *types.BlockData) error {
}

if err := s.handleBlock(block); err != nil {
logger.Errorf("failed to handle block number %s: %s", block.Header.Number, err)
logger.Debugf("failed to handle block number %s: %s", block.Header.Number, err)
return err
}

Expand Down