remove read task type and run gen and docsgen

filecoin-project · May 20, 2021 · c17300d · c17300d
1 parent 50d7acf
commit c17300d
Show file tree

Hide file tree

Showing 16 changed files with 858 additions and 923 deletions.
diff --git a/api/api_worker.go b/api/api_worker.go
@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"io"
 
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
@@ -43,7 +42,6 @@ type Worker interface {
 	ReleaseUnsealed(ctx context.Context, sector storage.SectorRef, safeToFree []storage.Range) (storiface.CallID, error)                                                                                 //perm:admin
 	MoveStorage(ctx context.Context, sector storage.SectorRef, types storiface.SectorFileType) (storiface.CallID, error)                                                                                 //perm:admin
 	UnsealPiece(context.Context, storage.SectorRef, storiface.UnpaddedByteIndex, abi.UnpaddedPieceSize, abi.SealRandomness, cid.Cid) (storiface.CallID, error)                                           //perm:admin
-	ReadPiece(context.Context, io.Writer, storage.SectorRef, storiface.UnpaddedByteIndex, abi.UnpaddedPieceSize) (storiface.CallID, error)                                                               //perm:admin
 	Fetch(context.Context, storage.SectorRef, storiface.SectorFileType, storiface.PathType, storiface.AcquireMode) (storiface.CallID, error)                                                             //perm:admin
 
 	TaskDisable(ctx context.Context, tt sealtasks.TaskType) error //perm:admin

diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go
diff --git a/api/proxy_gen.go b/api/proxy_gen.go
diff --git a/api/v0api/v0mocks/mock_full.go b/api/v0api/v0mocks/mock_full.go
diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz
diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz
diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz
diff --git a/cli/servicesmock_test.go b/cli/servicesmock_test.go
diff --git a/documentation/en/api-v0-methods-worker.md b/documentation/en/api-v0-methods-worker.md
@@ -15,8 +15,6 @@
   * [MoveStorage](#MoveStorage)
 * [Process](#Process)
   * [ProcessSession](#ProcessSession)
-* [Read](#Read)
-  * [ReadPiece](#ReadPiece)
 * [Release](#Release)
   * [ReleaseUnsealed](#ReleaseUnsealed)
 * [Seal](#Seal)
@@ -263,41 +261,6 @@ Inputs: `null`
 
 Response: `"07070707-0707-0707-0707-070707070707"`
 
-## Read
-
-
-### ReadPiece
-
-
-Perms: admin
-
-Inputs:
-```json
-[
-  {},
-  {
-    "ID": {
-      "Miner": 1000,
-      "Number": 9
-    },
-    "ProofType": 8
-  },
-  1040384,
-  1024
-]
-```
-
-Response:
-```json
-{
-  "Sector": {
-    "Miner": 1000,
-    "Number": 9
-  },
-  "ID": "07070707-0707-0707-0707-070707070707"
-}
-```
-
 ## Release
 
 

diff --git a/extern/sector-storage/manager.go b/extern/sector-storage/manager.go
@@ -133,7 +133,7 @@ func New(ctx context.Context, lstor *stores.Local, stor *stores.Remote, ls store
 	go m.sched.runSched()
 
 	localTasks := []sealtasks.TaskType{
-		sealtasks.TTCommit1, sealtasks.TTFinalize, sealtasks.TTFetch, sealtasks.TTReadUnsealed,
+		sealtasks.TTCommit1, sealtasks.TTFinalize, sealtasks.TTFetch,
 	}
 	if sc.AllowAddPiece {
 		localTasks = append(localTasks, sealtasks.TTAddPiece)

diff --git a/extern/sector-storage/resources.go b/extern/sector-storage/resources.go
@@ -313,7 +313,6 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredSealProof]Resources
 
 func init() {
 	ResourceTable[sealtasks.TTUnseal] = ResourceTable[sealtasks.TTPreCommit1] // TODO: measure accurately
-	ResourceTable[sealtasks.TTReadUnsealed] = ResourceTable[sealtasks.TTFetch]
 
 	// V1_1 is the same as V1
 	for _, m := range ResourceTable {

diff --git a/extern/sector-storage/sealtasks/task.go b/extern/sector-storage/sealtasks/task.go
@@ -11,21 +11,19 @@ const (
 
 	TTFinalize TaskType = "seal/v0/finalize"
 
-	TTFetch        TaskType = "seal/v0/fetch"
-	TTUnseal       TaskType = "seal/v0/unseal"
-	TTReadUnsealed TaskType = "seal/v0/unsealread"
+	TTFetch  TaskType = "seal/v0/fetch"
+	TTUnseal TaskType = "seal/v0/unseal"
 )
 
 var order = map[TaskType]int{
-	TTAddPiece:     6, // least priority
-	TTPreCommit1:   5,
-	TTPreCommit2:   4,
-	TTCommit2:      3,
-	TTCommit1:      2,
-	TTUnseal:       1,
-	TTFetch:        -1,
-	TTReadUnsealed: -1,
-	TTFinalize:     -2, // most priority
+	TTAddPiece:   6, // least priority
+	TTPreCommit1: 5,
+	TTPreCommit2: 4,
+	TTCommit2:    3,
+	TTCommit1:    2,
+	TTUnseal:     1,
+	TTFetch:      -1,
+	TTFinalize:   -2, // most priority
 }
 
 var shortNames = map[TaskType]string{
@@ -38,9 +36,8 @@ var shortNames = map[TaskType]string{
 
 	TTFinalize: "FIN",
 
-	TTFetch:        "GET",
-	TTUnseal:       "UNS",
-	TTReadUnsealed: "RD",
+	TTFetch:  "GET",
+	TTUnseal: "UNS",
 }
 
 func (a TaskType) MuchLess(b TaskType) (bool, bool) {

diff --git a/extern/sector-storage/stores/util_unix.go b/extern/sector-storage/stores/util_unix.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/mitchellh/go-homedir"
@@ -33,7 +34,14 @@ func move(from, to string) error {
 	//  can do better
 
 	var errOut bytes.Buffer
-	cmd := exec.Command("/usr/bin/env", "mv", "-t", toDir, from) // nolint
+
+	var cmd *exec.Cmd
+	if runtime.GOOS == "darwin" {
+		cmd = exec.Command("/usr/bin/env", "mv", from, toDir) // nolint
+	} else {
+		cmd = exec.Command("/usr/bin/env", "mv", "-t", toDir, from) // nolint
+	}
+
 	cmd.Stderr = &errOut
 	if err := cmd.Run(); err != nil {
 		return xerrors.Errorf("exec mv (stderr: %s): %w", strings.TrimSpace(errOut.String()), err)

diff --git a/extern/sector-storage/storiface/worker.go b/extern/sector-storage/storiface/worker.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"time"
 
 	"github.com/google/uuid"
@@ -87,7 +86,6 @@ type WorkerCalls interface {
 	ReleaseUnsealed(ctx context.Context, sector storage.SectorRef, safeToFree []storage.Range) (CallID, error)
 	MoveStorage(ctx context.Context, sector storage.SectorRef, types SectorFileType) (CallID, error)
 	UnsealPiece(context.Context, storage.SectorRef, UnpaddedByteIndex, abi.UnpaddedPieceSize, abi.SealRandomness, cid.Cid) (CallID, error)
-	ReadPiece(context.Context, io.Writer, storage.SectorRef, UnpaddedByteIndex, abi.UnpaddedPieceSize) (CallID, error)
 	Fetch(context.Context, storage.SectorRef, SectorFileType, PathType, AcquireMode) (CallID, error)
 }