Skip to content
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

Jump to bottom

In kaspaminer, don't crash on submitBlock timeout #1462

Merged
merged 5 commits into from
Jan 29, 2021
Merged

In kaspaminer, don't crash on submitBlock timeout #1462

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e99c11
In kaspaminer, don't crash on submitBlock timeout.
stasatdaglabs Jan 28, 2021
9481fbb
Make timeout messages have a log level of Warn.
stasatdaglabs Jan 28, 2021
8164b7f
Wait for a second after receiving a reject for IBD.
stasatdaglabs Jan 28, 2021
74f4d31
Merge branch 'v0.9.0-dev' into miner-dont-crash-on-timeout
stasatdaglabs Jan 28, 2021
3b3c83f
Merge branch 'v0.9.0-dev' into miner-dont-crash-on-timeout
elichai Jan 28, 2021
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
10 changes: 8 additions & 2 deletions cmd/kaspaminer/mineloop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,14 @@ func handleFoundBlock(client *minerClient, block *externalapi.DomainBlock) error

rejectReason, err := client.SubmitBlock(block)
if err != nil {
if nativeerrors.Is(err, router.ErrTimeout) {
log.Warnf("Got timeout while submitting block %s to %s: %s", blockHash, client.Address(), err)
return nil
Copy link
Member

Choose a reason for hiding this comment

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

The result of this is that the block will be discarded.
But there's no easy way to solve this right now.
I feel like we should re-write the cpu miner in an async way, that way a separate go-routine will loop trying to submit

}
if rejectReason == appmessage.RejectReasonIsInIBD {
log.Warnf("Block %s was rejected because the node is in IBD", blockHash)
const waitTime = 1 * time.Second
log.Warnf("Block %s was rejected because the node is in IBD. Waiting for %s", blockHash, waitTime)
time.Sleep(waitTime)
return nil
}
return errors.Errorf("Error submitting block %s to %s: %s", blockHash, client.Address(), err)
Expand Down Expand Up @@ -152,7 +158,7 @@ func templatesLoop(client *minerClient, miningAddr util.Address,
getBlockTemplate := func() {
template, err := client.GetBlockTemplate(miningAddr.String())
if nativeerrors.Is(err, router.ErrTimeout) {
log.Infof("Got timeout while requesting block template from %s", client.Address())
log.Warnf("Got timeout while requesting block template from %s: %s", client.Address(), err)
return
} else if err != nil {
errChan <- errors.Errorf("Error getting block template from %s: %s", client.Address(), err)
Expand Down