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

lp alerting and addtaskfunc doc

Browse Source
This commit is contained in:
Andrew Jackson (Ajax) 2023-10-25 17:10:52 -05:00
parent 43680400c3
commit 1602b7b980
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/lotus-provider/run.go
View File

@ -26,6 +26,7 @@ import (
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util" cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/journal"
"github.com/filecoin-project/lotus/journal/alerting"
"github.com/filecoin-project/lotus/journal/fsjournal" "github.com/filecoin-project/lotus/journal/fsjournal"
"github.com/filecoin-project/lotus/lib/harmony/harmonydb" "github.com/filecoin-project/lotus/lib/harmony/harmonydb"
"github.com/filecoin-project/lotus/lib/harmony/harmonytask" "github.com/filecoin-project/lotus/lib/harmony/harmonytask"
@ -236,13 +237,15 @@ var runCmd = &cli.Command{
} }
defer j.Close() defer j.Close()
si := paths.NewIndexProxy( /*TODO Alerting*/ nil, db, true) al := alerting.NewAlertingSystem(j)
si := paths.NewIndexProxy(al, db, true)
lstor, err := paths.NewLocal(ctx, lr, si, nil /*TODO URLs*/) lstor, err := paths.NewLocal(ctx, lr, si, nil /*TODO URLs*/)
if err != nil { if err != nil {
return err return err
} }
full, fullCloser, err := cliutil.GetFullNodeAPIV1LotusProvider(cctx, cfg.Apis.FULLNODE_API_INFO) // TODO switch this into DB entries.
full, fullCloser, err := cliutil.GetFullNodeAPIV1LotusProvider(cctx, cfg.Apis.FULLNODE_API_INFO)
if err != nil { if err != nil {
return err return err
} }
@ -254,7 +257,7 @@ var runCmd = &cli.Command{
} }
stor := paths.NewRemote(lstor, si, http.Header(sa), 10, &paths.DefaultPartialFileHandler{}) stor := paths.NewRemote(lstor, si, http.Header(sa), 10, &paths.DefaultPartialFileHandler{})
mds, err := lr.Datastore(ctx, "/metadata") mds, err := lr.Datastore(ctx, "/metadata") // TODO rm datastore after sector-info moves to DB
if err != nil { if err != nil {
return err return err
} }

8
lib/harmony/harmonytask/harmonytask.go
View File

@ -76,7 +76,7 @@ type TaskInterface interface {
// func (b *BazType)Adder(addTask AddTaskFunc) { // func (b *BazType)Adder(addTask AddTaskFunc) {
// for { // for {
// bazMaker := <- bazChannel // bazMaker := <- bazChannel
// addTask("baz", func(t harmonytask.TaskID, txn db.Transaction) bool { // addTask("baz", func(t harmonytask.TaskID, txn db.Transaction) (bool, error) {
// _, err := txn.Exec(`INSERT INTO bazInfoTable (taskID, qix, mot) // _, err := txn.Exec(`INSERT INTO bazInfoTable (taskID, qix, mot)
// VALUES ($1,$2,$3)`, id, bazMaker.qix, bazMaker.mot) // VALUES ($1,$2,$3)`, id, bazMaker.qix, bazMaker.mot)
// if err != nil { // if err != nil {
@ -90,6 +90,12 @@ type TaskInterface interface {
Adder(AddTaskFunc) Adder(AddTaskFunc)
} }
// AddTaskFunc is responsible for adding a task's details "extra info" to the DB.
// It should return true if the task should be added, false if it was already there.
// This is typically accomplished with a "unique" index on your detals table that
// would cause the insert to fail.
// The error indicates that instead of a conflict (which we should ignore) that we
// actually have a serious problem that needs to be logged with context.
type AddTaskFunc func(extraInfo func(TaskID, *harmonydb.Tx) (bool, error)) type AddTaskFunc func(extraInfo func(TaskID, *harmonydb.Tx) (bool, error))
type TaskEngine struct { type TaskEngine struct {