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

Merge branch 'zgfzgf-miner-break' into master

Browse Source
This commit is contained in:
Łukasz Magiera 2020-09-24 16:03:47 +02:00
commit 28b46ad08c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
miner/miner.go
View File

@ -149,7 +149,7 @@ func (m *Miner) mine(ctx context.Context) {
defer span.End() defer span.End()
var lastBase MiningBase var lastBase MiningBase
minerLoop:
for { for {
select { select {
case <-m.stop: case <-m.stop:
@ -171,7 +171,7 @@ func (m *Miner) mine(ctx context.Context) {
if err != nil { if err != nil {
log.Errorf("failed to get best mining candidate: %s", err) log.Errorf("failed to get best mining candidate: %s", err)
if !m.niceSleep(time.Second * 5) { if !m.niceSleep(time.Second * 5) {
break continue minerLoop
} }
continue continue
} }
@ -203,7 +203,7 @@ func (m *Miner) mine(ctx context.Context) {
if err != nil { if err != nil {
log.Errorf("failed getting beacon entry: %s", err) log.Errorf("failed getting beacon entry: %s", err)
if !m.niceSleep(time.Second) { if !m.niceSleep(time.Second) {
break continue minerLoop
} }
continue continue
} }
@ -214,7 +214,7 @@ func (m *Miner) mine(ctx context.Context) {
if base.TipSet.Equals(lastBase.TipSet) && lastBase.NullRounds == base.NullRounds { if base.TipSet.Equals(lastBase.TipSet) && lastBase.NullRounds == base.NullRounds {
log.Warnf("BestMiningCandidate from the previous round: %s (nulls:%d)", lastBase.TipSet.Cids(), lastBase.NullRounds) log.Warnf("BestMiningCandidate from the previous round: %s (nulls:%d)", lastBase.TipSet.Cids(), lastBase.NullRounds)
if !m.niceSleep(time.Duration(build.BlockDelaySecs) * time.Second) { if !m.niceSleep(time.Duration(build.BlockDelaySecs) * time.Second) {
break continue minerLoop
} }
continue continue
} }
@ -225,7 +225,7 @@ func (m *Miner) mine(ctx context.Context) {
if err != nil { if err != nil {
log.Errorf("mining block failed: %+v", err) log.Errorf("mining block failed: %+v", err)
if !m.niceSleep(time.Second) { if !m.niceSleep(time.Second) {
break continue minerLoop
} }
onDone(false, 0, err) onDone(false, 0, err)
continue continue