rm Do() chg and storagemgr

cmd/lotus-provider/deps/deps.go

@@ -31,7 +31,6 @@ import (
 	"github.com/filecoin-project/lotus/journal/alerting"
 	"github.com/filecoin-project/lotus/journal/fsjournal"
 	"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
-	"github.com/filecoin-project/lotus/lib/harmony/resources/storagemgr"
 	"github.com/filecoin-project/lotus/node/config"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/repo"
@@ -104,7 +103,6 @@ type Deps struct {
 	LocalStore *paths.Local
 	LocalPaths *paths.BasicLocalStorage
 	ListenAddr string
-	StorageMgr *storagemgr.StorageMgr
 }
 
 const (
@@ -256,13 +254,6 @@ Get it with: jq .PrivateKey ~/.lotus-miner/keystore/MF2XI2BNNJ3XILLQOJUXMYLUMU`,
 		}
 	}
 
-	if deps.StorageMgr == nil {
-		lo, err := deps.LocalStore.Local(ctx)
-		if err != nil {
-			return xerrors.Errorf("could not get local storage: %w", err)
-		}
-		deps.StorageMgr = storagemgr.New(lo)
-	}
 	fmt.Println("last line of populate")
 
 	return nil

cmd/lotus-provider/run.go

@@ -119,10 +119,6 @@ var runCmd = &cli.Command{
 			return err
 		}
 
-		// Get rid of all the partial-writes of any potential previous runs.
-		dependencies.StorageMgr.Cleanup()
-
-
 		taskEngine, err := tasks.StartTasks(ctx, dependencies)
 
 		if err != nil {

itests/harmonytask_test.go

@@ -37,7 +37,7 @@ func withDbSetup(t *testing.T, f func(*kit.TestMiner)) {
 	f(miner)
 }
 
-func (t *task1) Do(taskID harmonytask.TaskID, te *harmonytask.TaskEngine, stillOwned func() bool) (done bool, err error) {
+func (t *task1) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bool, err error) {
 	if !stillOwned() {
 		return false, errors.New("Why not still owned?")
 	}
@@ -104,8 +104,8 @@ type passthru struct {
 	adder     func(add harmonytask.AddTaskFunc)
 }
 
-func (t *passthru) Do(taskID harmonytask.TaskID, te *harmonytask.TaskEngine, stillOwned func() bool) (done bool, err error) {
-	return t.do(tID, stillOwned)
+func (t *passthru) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bool, err error) {
+	return t.do(taskID, stillOwned)
 }
 func (t *passthru) CanAccept(list []harmonytask.TaskID, e *harmonytask.TaskEngine) (*harmonytask.TaskID, error) {
 	return t.canAccept(list, e)

lib/harmony/harmonytask/harmonytask.go

@@ -49,7 +49,7 @@ type TaskInterface interface {
 	// ONLY be called by harmonytask.
 	// Indicate if the task no-longer needs scheduling with done=true including
 	// cases where it's past the deadline.
-	Do(taskID TaskID, te *TaskEngine, stillOwned func() bool) (done bool, err error)
+	Do(taskID TaskID, stillOwned func() bool) (done bool, err error)
 
 	// CanAccept should return if the task can run on this machine. It should
 	// return null if the task type is not allowed on this machine.

lib/harmony/harmonytask/task_type_handler.go

@@ -100,17 +100,19 @@ top:
 	var location string
 	releaseStorage := func() {
 	}
-	if c := h.TaskTypeDetails.Cost.Storage.Claim; c != nil {
-		if location, err = c(int(*tID)); err != nil {
-			log.Infow("did not accept task", "task_id", strconv.Itoa(int(*tID)), "reason", "storage claim failed", "name", h.Name, "error", err)
-			return false
-		}
-		h.LocationMap.Store(*tID, location)
-		releaseStorage = func() {
-			if err := h.TaskTypeDetails.Cost.Storage.MarkComplete(location); err != nil {
-				log.Errorw("Could not release storage", "error", err)
+	if h.TaskTypeDetails.Cost.Storage != nil {
+		if c := h.TaskTypeDetails.Cost.Storage.Claim; c != nil {
+			if err = c(int(*tID)); err != nil {
+				log.Infow("did not accept task", "task_id", strconv.Itoa(int(*tID)), "reason", "storage claim failed", "name", h.Name, "error", err)
+				return false
+			}
+			h.LocationMap.Store(*tID, location)
+			releaseStorage = func() {
+				if err := h.TaskTypeDetails.Cost.Storage.MarkComplete(); err != nil {
+					log.Errorw("Could not release storage", "error", err)
+				}
+				h.LocationMap.Delete(*tID)
 			}
-			h.LocationMap.Delete(*tID)
 		}
 	}
 
@@ -270,8 +272,10 @@ func (h *taskTypeHandler) AssertMachineHasCapacity() error {
 		return errors.New("Did not accept " + h.Name + " task: out of available GPU")
 	}
 
-	if has := h.TaskTypeDetails.Cost.Storage.HasCapacity; has != nil && !has() {
-		return errors.New("Did not accept " + h.Name + " task: out of available Storage")
+	if h.TaskTypeDetails.Cost.Storage != nil {
+		if has := h.TaskTypeDetails.Cost.Storage.HasCapacity; has != nil && !has() {
+			return errors.New("Did not accept " + h.Name + " task: out of available Storage")
+		}
 	}
 	return nil
 }

lib/harmony/resources/resources.go

@@ -29,15 +29,15 @@ type Resources struct {
 
 // Optional Storage management.
 // See storagemgr/storagemgt.go for more details.
-type Storage struct {
-	HasCapacity func() bool
+type Storage interface {
+	HasCapacity() bool
 
 	// This allows some other system to claim space for this task.
-	Claim func(taskID int) (location string, err error)
+	Claim(taskID int) error
 
 	// This allows some other system to consider the task done.
 	// It's up to the caller to remove the data, if that applies.
-	MarkComplete func(location string) error
+	MarkComplete() error
 }
 type Reg struct {
 	Resources

provider/lpmessage/sender.go

@@ -59,7 +59,7 @@ type SendTask struct {
 	db *harmonydb.DB
 }
 
-func (s *SendTask) Do(taskID harmonytask.TaskID, te *harmonytask.TaskEngine, stillOwned func() bool) (done bool, err error) {
+func (s *SendTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bool, err error) {
 	ctx := context.TODO()
 
 	// get message from db