diff --git a/api/api_worker.go b/api/api_worker.go index 87f41b1f3..fa54cb5e8 100644 --- a/api/api_worker.go +++ b/api/api_worker.go @@ -3,12 +3,13 @@ package api import ( "context" + "github.com/filecoin-project/sector-storage/sealtasks" + "github.com/filecoin-project/sector-storage/stores" "github.com/filecoin-project/sector-storage/storiface" + "github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/sector-storage/sealtasks" - "github.com/filecoin-project/sector-storage/stores" ) type WorkerApi interface { @@ -20,4 +21,5 @@ type WorkerApi interface { Info(context.Context) (storiface.WorkerInfo, error) storage.Sealer + Fetch(context.Context, abi.SectorID, stores.SectorFileType, bool) error } diff --git a/api/apistruct/struct.go b/api/apistruct/struct.go index ca55f2b36..3f1e4a15d 100644 --- a/api/apistruct/struct.go +++ b/api/apistruct/struct.go @@ -225,6 +225,8 @@ type WorkerStruct struct { SealCommit1 func(ctx context.Context, sector abi.SectorID, ticket abi.SealRandomness, seed abi.InteractiveSealRandomness, pieces []abi.PieceInfo, cids storage.SectorCids) (storage.Commit1Out, error) `perm:"admin"` SealCommit2 func(context.Context, abi.SectorID, storage.Commit1Out) (storage.Proof, error) `perm:"admin"` FinalizeSector func(context.Context, abi.SectorID) error `perm:"admin"` + + Fetch func(context.Context, abi.SectorID, stores.SectorFileType, bool) error `perm:"admin"` } } @@ -810,6 +812,10 @@ func (w *WorkerStruct) FinalizeSector(ctx context.Context, sector abi.SectorID) return w.Internal.FinalizeSector(ctx, sector) } +func (w *WorkerStruct) Fetch(ctx context.Context, id abi.SectorID, fileType stores.SectorFileType, b bool) error { + return w.Internal.Fetch(ctx, id, fileType, b) +} + var _ api.Common = &CommonStruct{} var _ api.FullNode = &FullNodeStruct{} var _ api.StorageMiner = &StorageMinerStruct{} diff --git a/cmd/lotus-seal-worker/main.go b/cmd/lotus-seal-worker/main.go index 015490036..ff7b0c5df 100644 --- a/cmd/lotus-seal-worker/main.go +++ b/cmd/lotus-seal-worker/main.go @@ -153,6 +153,8 @@ var runCmd = &cli.Command{ var taskTypes []sealtasks.TaskType + taskTypes = append(taskTypes, sealtasks.TTFetch) + if cctx.Bool("precommit1") { taskTypes = append(taskTypes, sealtasks.TTPreCommit1) } diff --git a/cmd/lotus-storage-miner/workers.go b/cmd/lotus-storage-miner/workers.go index b44c15af6..b6d547480 100644 --- a/cmd/lotus-storage-miner/workers.go +++ b/cmd/lotus-storage-miner/workers.go @@ -57,11 +57,7 @@ var workersListCmd = &cli.Command{ fmt.Printf("Worker %d, host %s\n", stat.id, stat.Info.Hostname) - if stat.CpuUse != -1 { - fmt.Printf("\tCPU: %d core(s) in use\n", stat.CpuUse) - } else { - fmt.Printf("\tCPU: all cores in use\n") - } + fmt.Printf("\tCPU: %d core(s) in use\n", stat.CpuUse) for _, gpu := range stat.Info.Resources.GPUs { fmt.Printf("\tGPU: %s, %sused\n", gpu, gpuUse) diff --git a/go.mod b/go.mod index a7a547cd4..3a5da1f7e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/filecoin-project/go-padreader v0.0.0-20200210211231-548257017ca6 github.com/filecoin-project/go-paramfetch v0.0.2-0.20200218225740-47c639bab663 github.com/filecoin-project/go-statestore v0.1.0 - github.com/filecoin-project/sector-storage v0.0.0-20200423222053-9eb049a833b9 + github.com/filecoin-project/sector-storage v0.0.0-20200428103407-5f1a27d52b30 github.com/filecoin-project/specs-actors v1.0.1-0.20200424220637-349bd6297517 github.com/filecoin-project/specs-storage v0.0.0-20200417134612-61b2d91a6102 github.com/filecoin-project/storage-fsm v0.0.0-20200423114251-f3bea4aa8bd7 diff --git a/go.sum b/go.sum index 047814ead..f4df2d2b4 100644 --- a/go.sum +++ b/go.sum @@ -169,10 +169,11 @@ github.com/filecoin-project/go-statestore v0.1.0 h1:t56reH59843TwXHkMcwyuayStBIi github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= github.com/filecoin-project/lotus v0.2.10/go.mod h1:om5PQA9ZT0lf16qI7Fz/ZGLn4LDCMqPC8ntZA9uncRE= github.com/filecoin-project/sector-storage v0.0.0-20200411000242-61616264b16d/go.mod h1:/yueJueMh0Yc+0G1adS0lhnedcSnjY86EjKsA20+DVY= -github.com/filecoin-project/sector-storage v0.0.0-20200423222053-9eb049a833b9 h1:Nj+kxEXRZsgKUPwpH+N57SuL8zYlmqXA1E2k2r6H6Hc= -github.com/filecoin-project/sector-storage v0.0.0-20200423222053-9eb049a833b9/go.mod h1:ooso9kOFQaZwk50u+Wc/tRISeETwuDREef8pC3EHQCI= +github.com/filecoin-project/sector-storage v0.0.0-20200428103407-5f1a27d52b30 h1:MlenH1KWLpDHgPzP0BhZ2I87M52GTv/JDWkoOkjhhbU= +github.com/filecoin-project/sector-storage v0.0.0-20200428103407-5f1a27d52b30/go.mod h1:q/V90xaSKTlu7KovS0uj+cAvlPPFrGn141ZO3iQNEdw= github.com/filecoin-project/specs-actors v0.0.0-20200210130641-2d1fbd8672cf/go.mod h1:xtDZUB6pe4Pksa/bAJbJ693OilaC5Wbot9jMhLm3cZA= github.com/filecoin-project/specs-actors v0.0.0-20200409043918-e569f4a2f504/go.mod h1:mdJraXq5vMy0+/FqVQIrnNlpQ/Em6zeu06G/ltQ0/lA= +github.com/filecoin-project/specs-actors v0.2.0/go.mod h1:nQYnFbQ7Y0bHZyq6HDEuVlCPR+U3z5Q3wMOQ+2aiV+Y= github.com/filecoin-project/specs-actors v1.0.0/go.mod h1:nQYnFbQ7Y0bHZyq6HDEuVlCPR+U3z5Q3wMOQ+2aiV+Y= github.com/filecoin-project/specs-actors v1.0.1-0.20200424220637-349bd6297517 h1:Qi8xaf90j4pdMn8NZZ8FWROsvaTu2iD/C2TT7gDRNQw= github.com/filecoin-project/specs-actors v1.0.1-0.20200424220637-349bd6297517/go.mod h1:nQYnFbQ7Y0bHZyq6HDEuVlCPR+U3z5Q3wMOQ+2aiV+Y=