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

storageminer: retry PoSt

Browse Source
This commit is contained in:
Łukasz Magiera 2019-09-26 17:35:32 +02:00
parent ad101640ad
commit ebb744f42f
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
storage/miner.go
View File

@ -10,6 +10,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"sync" "sync"
"time"
"github.com/filecoin-project/go-lotus/api" "github.com/filecoin-project/go-lotus/api"
"github.com/filecoin-project/go-lotus/build" "github.com/filecoin-project/go-lotus/build"
@ -94,7 +95,7 @@ func (m *Miner) Run(ctx context.Context) error {
} }
go m.handlePostingSealedSectors(ctx) go m.handlePostingSealedSectors(ctx)
go m.schedulePoSt(ctx, ts) go m.schedulePoSt(ctx, ts, false)
return nil return nil
} }
@ -172,13 +173,13 @@ func (m *Miner) commitSector(ctx context.Context, sinfo sectorbuilder.SectorSeal
return return
} }
m.schedulePoSt(ctx, nil) m.schedulePoSt(ctx, nil, false)
}() }()
return nil return nil
} }
func (m *Miner) schedulePoSt(ctx context.Context, baseTs *types.TipSet) { func (m *Miner) schedulePoSt(ctx context.Context, baseTs *types.TipSet, force bool) {
ppe, err := m.api.StateMinerProvingPeriodEnd(ctx, m.maddr, baseTs) ppe, err := m.api.StateMinerProvingPeriodEnd(ctx, m.maddr, baseTs)
if err != nil { if err != nil {
log.Errorf("failed to get proving period end for miner: %s", err) log.Errorf("failed to get proving period end for miner: %s", err)
@ -194,10 +195,12 @@ func (m *Miner) schedulePoSt(ctx context.Context, baseTs *types.TipSet) {
m.schedLk.Lock() m.schedLk.Lock()
if m.postSched >= ppe { if m.postSched >= ppe {
if !force || m.postSched > ppe {
log.Warnf("schedulePoSt already called for proving period >= %d", m.postSched) log.Warnf("schedulePoSt already called for proving period >= %d", m.postSched)
m.schedLk.Unlock() m.schedLk.Unlock()
return return
} }
}
m.postSched = ppe m.postSched = ppe
m.schedLk.Unlock() m.schedLk.Unlock()
@ -213,33 +216,44 @@ func (m *Miner) schedulePoSt(ctx context.Context, baseTs *types.TipSet) {
} }
} }
func (m *Miner) restartPost(ts *types.TipSet) {
time.Sleep(400 * time.Millisecond)
log.Warn("Restarting PoSt after failure")
m.schedulePoSt(context.TODO(), ts, true)
}
func (m *Miner) startPost(ts *types.TipSet, curH uint64) error { func (m *Miner) startPost(ts *types.TipSet, curH uint64) error {
log.Info("starting PoSt computation") log.Info("starting PoSt computation")
head, err := m.api.ChainHead(context.TODO()) head, err := m.api.ChainHead(context.TODO())
if err != nil { if err != nil {
m.restartPost(ts)
return err return err
} }
postWaitCh, _, err := m.maybeDoPost(context.TODO(), head) postWaitCh, _, err := m.maybeDoPost(context.TODO(), head)
if err != nil { if err != nil {
m.restartPost(ts)
return err return err
} }
if postWaitCh == nil { if postWaitCh == nil {
return errors.New("PoSt didn't start") log.Errorf("PoSt didn't start")
m.restartPost(ts)
return nil
} }
go func() { go func() {
err := <-postWaitCh err := <-postWaitCh
if err != nil { if err != nil {
log.Errorf("got error back from postWaitCh: %s", err) log.Errorf("got error back from postWaitCh: %s", err)
m.restartPost(ts)
return return
} }
log.Infof("post successfully submitted") log.Infof("post successfully submitted")
m.schedulePoSt(context.TODO(), ts) m.schedulePoSt(context.TODO(), ts, false)
}() }()
return nil return nil
} }
@ -316,7 +330,7 @@ func (m *Miner) maybeDoPost(ctx context.Context, ts *types.TipSet) (<-chan error
} }
// TODO: check receipt // TODO: check receipt
m.schedulePoSt(ctx, nil) m.schedulePoSt(ctx, nil, true)
}() }()
return ret, sourceTs.MinTicketBlock(), nil return ret, sourceTs.MinTicketBlock(), nil