apply suggestions
This commit is contained in:
parent
243bf1a0b3
commit
a24028c3c0
@ -8,8 +8,6 @@ import (
|
|||||||
"github.com/samber/lo"
|
"github.com/samber/lo"
|
||||||
"golang.org/x/xerrors"
|
"golang.org/x/xerrors"
|
||||||
|
|
||||||
"github.com/filecoin-project/go-address"
|
|
||||||
|
|
||||||
"github.com/filecoin-project/lotus/cmd/curio/deps"
|
"github.com/filecoin-project/lotus/cmd/curio/deps"
|
||||||
curio "github.com/filecoin-project/lotus/curiosrc"
|
curio "github.com/filecoin-project/lotus/curiosrc"
|
||||||
"github.com/filecoin-project/lotus/curiosrc/chainsched"
|
"github.com/filecoin-project/lotus/curiosrc/chainsched"
|
||||||
@ -39,20 +37,6 @@ func StartTasks(ctx context.Context, dependencies *deps.Deps) (*harmonytask.Task
|
|||||||
si := dependencies.Si
|
si := dependencies.Si
|
||||||
var activeTasks []harmonytask.TaskInterface
|
var activeTasks []harmonytask.TaskInterface
|
||||||
|
|
||||||
// Get all miner address from config
|
|
||||||
var miners []address.Address
|
|
||||||
for _, ad := range cfg.Addresses {
|
|
||||||
ad := ad
|
|
||||||
for _, m := range ad.MinerAddresses {
|
|
||||||
m := m
|
|
||||||
maddr, err := address.NewFromString(m)
|
|
||||||
if err != nil {
|
|
||||||
return nil, xerrors.Errorf("failed to parse the miner address: %w", err)
|
|
||||||
}
|
|
||||||
miners = append(miners, maddr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sender, sendTask := message.NewSender(full, full, db)
|
sender, sendTask := message.NewSender(full, full, db)
|
||||||
activeTasks = append(activeTasks, sendTask)
|
activeTasks = append(activeTasks, sendTask)
|
||||||
|
|
||||||
@ -92,7 +76,7 @@ func StartTasks(ctx context.Context, dependencies *deps.Deps) (*harmonytask.Task
|
|||||||
{
|
{
|
||||||
// Piece handling
|
// Piece handling
|
||||||
if cfg.Subsystems.EnableParkPiece {
|
if cfg.Subsystems.EnableParkPiece {
|
||||||
parkPieceTask := piece.NewParkPieceTask(db, must.One(slrLazy.Val()), cfg.Subsystems.ParkPieceMaxTasks, miners)
|
parkPieceTask := piece.NewParkPieceTask(db, must.One(slrLazy.Val()), cfg.Subsystems.ParkPieceMaxTasks)
|
||||||
cleanupPieceTask := piece.NewCleanupPieceTask(db, must.One(slrLazy.Val()), 0)
|
cleanupPieceTask := piece.NewCleanupPieceTask(db, must.One(slrLazy.Val()), 0)
|
||||||
activeTasks = append(activeTasks, parkPieceTask, cleanupPieceTask)
|
activeTasks = append(activeTasks, parkPieceTask, cleanupPieceTask)
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@ import (
|
|||||||
|
|
||||||
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
|
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
|
||||||
"github.com/filecoin-project/lotus/lib/harmony/resources"
|
"github.com/filecoin-project/lotus/lib/harmony/resources"
|
||||||
|
storagePaths "github.com/filecoin-project/lotus/storage/paths"
|
||||||
"github.com/filecoin-project/lotus/storage/sealer/storiface"
|
"github.com/filecoin-project/lotus/storage/sealer/storiface"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -68,7 +69,7 @@ func (sb *SealCalls) Storage(taskToSectorRef func(taskID harmonytask.TaskID) (Se
|
|||||||
func (t *TaskStorage) HasCapacity() bool {
|
func (t *TaskStorage) HasCapacity() bool {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
paths, err := t.sc.sectors.sindex.StorageBestAlloc(ctx, t.alloc, t.ssize, t.pathType, abi.ActorID(0))
|
paths, err := t.sc.sectors.sindex.StorageBestAlloc(ctx, t.alloc, t.ssize, t.pathType, storagePaths.NoMinerFilter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("finding best alloc in HasCapacity: %+v", err)
|
log.Errorf("finding best alloc in HasCapacity: %+v", err)
|
||||||
return false
|
return false
|
||||||
|
@ -9,8 +9,6 @@ import (
|
|||||||
logging "github.com/ipfs/go-log/v2"
|
logging "github.com/ipfs/go-log/v2"
|
||||||
"golang.org/x/xerrors"
|
"golang.org/x/xerrors"
|
||||||
|
|
||||||
"github.com/filecoin-project/go-address"
|
|
||||||
|
|
||||||
"github.com/filecoin-project/lotus/curiosrc/ffi"
|
"github.com/filecoin-project/lotus/curiosrc/ffi"
|
||||||
"github.com/filecoin-project/lotus/curiosrc/seal"
|
"github.com/filecoin-project/lotus/curiosrc/seal"
|
||||||
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
|
||||||
@ -34,7 +32,7 @@ type ParkPieceTask struct {
|
|||||||
max int
|
max int
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewParkPieceTask(db *harmonydb.DB, sc *ffi.SealCalls, max int, miners []address.Address) *ParkPieceTask {
|
func NewParkPieceTask(db *harmonydb.DB, sc *ffi.SealCalls, max int) *ParkPieceTask {
|
||||||
pt := &ParkPieceTask{
|
pt := &ParkPieceTask{
|
||||||
db: db,
|
db: db,
|
||||||
sc: sc,
|
sc: sc,
|
||||||
|
@ -738,7 +738,7 @@ func (dbi *DBIndex) StorageBestAlloc(ctx context.Context, allocate storiface.Sec
|
|||||||
for _, row := range rows {
|
for _, row := range rows {
|
||||||
// Matching with 0 as a workaround to avoid having minerID
|
// Matching with 0 as a workaround to avoid having minerID
|
||||||
// present when calling TaskStorage.HasCapacity()
|
// present when calling TaskStorage.HasCapacity()
|
||||||
if !(miner == NoMinerFilter) {
|
if miner != NoMinerFilter {
|
||||||
allowMiners := splitString(row.AllowMiners)
|
allowMiners := splitString(row.AllowMiners)
|
||||||
denyMiners := splitString(row.DenyMiners)
|
denyMiners := splitString(row.DenyMiners)
|
||||||
proceed, msg, err := MinerFilter(allowMiners, denyMiners, miner)
|
proceed, msg, err := MinerFilter(allowMiners, denyMiners, miner)
|
||||||
|
Loading…
Reference in New Issue
Block a user