sector import: Plumb sector download task canfig

cmd/lotus-worker/main.go

@@ -224,6 +224,12 @@ var runCmd = &cli.Command{
 			Value:   true,
 			EnvVars: []string{"LOTUS_WORKER_REGEN_SECTOR_KEY"},
 		},
+		&cli.BoolFlag{
+			Name:    "sector-download",
+			Usage:   "enable external sector data download",
+			Value:   false,
+			EnvVars: []string{"LOTUS_WORKER_SECTOR_DOWNLOAD"},
+		},
 		&cli.BoolFlag{
 			Name:    "windowpost",
 			Usage:   "enable window post",
@@ -373,6 +379,9 @@ var runCmd = &cli.Command{
 		if (workerType == sealtasks.WorkerSealing || cctx.IsSet("addpiece")) && cctx.Bool("addpiece") {
 			taskTypes = append(taskTypes, sealtasks.TTAddPiece, sealtasks.TTDataCid)
 		}
+		if (workerType == sealtasks.WorkerSealing || cctx.IsSet("sector-download")) && cctx.Bool("sector-download") {
+			taskTypes = append(taskTypes, sealtasks.TTDownloadSector)
+		}
 		if (workerType == sealtasks.WorkerSealing || cctx.IsSet("precommit1")) && cctx.Bool("precommit1") {
 			taskTypes = append(taskTypes, sealtasks.TTPreCommit1)
 		}

documentation/en/cli-lotus-worker.md

@@ -53,6 +53,7 @@ OPTIONS:
    --prove-replica-update2       enable prove replica update 2 (default: true) [$LOTUS_WORKER_PROVE_REPLICA_UPDATE2]
    --regen-sector-key            enable regen sector key (default: true) [$LOTUS_WORKER_REGEN_SECTOR_KEY]
    --replica-update              enable replica update (default: true) [$LOTUS_WORKER_REPLICA_UPDATE]
+   --sector-download             enable external sector data download (default: false) [$LOTUS_WORKER_SECTOR_DOWNLOAD]
    --timeout value               used when 'listen' is unspecified. must be a valid duration recognized by golang's time.ParseDuration function (default: "30m") [$LOTUS_WORKER_TIMEOUT]
    --unseal                      enable unsealing (32G sectors: 1 core, 128GiB Memory) (default: true) [$LOTUS_WORKER_UNSEAL]
    --windowpost                  enable window post (default: false) [$LOTUS_WORKER_WINDOWPOST]

documentation/en/default-lotus-miner-config.toml

@@ -612,8 +612,10 @@
   # env var: LOTUS_STORAGE_PARALLELFETCHLIMIT
   #ParallelFetchLimit = 10
 
-  # Local worker config
-  #
+  # type: bool
+  # env var: LOTUS_STORAGE_ALLOWSECTORDOWNLOAD
+  #AllowSectorDownload = true
+
   # type: bool
   # env var: LOTUS_STORAGE_ALLOWADDPIECE
   #AllowAddPiece = true

itests/kit/ensemble.go

@@ -636,6 +636,7 @@ func (n *Ensemble) Start() *Ensemble {
 				scfg := config.DefaultStorageMiner()
 
 				if noLocal {
+					scfg.Storage.AllowSectorDownload = false
 					scfg.Storage.AllowAddPiece = false
 					scfg.Storage.AllowPreCommit1 = false
 					scfg.Storage.AllowPreCommit2 = false

itests/sector_import_test.go

@@ -161,8 +161,7 @@ func TestSectorImportAfterPC2(t *testing.T) {
 	require.Len(t, ng, 1)
 	require.Equal(t, snum, ng[0])
 
-	// todo wait sealed
-
+	miner.WaitSectorsProving(ctx, map[abi.SectorNumber]struct{}{snum: {}})
 }
 
 func remoteGetSector(sectorRoot string) func(w http.ResponseWriter, r *http.Request) {

node/config/def.go

@@ -146,6 +146,7 @@ func DefaultStorageMiner() *StorageMiner {
 		},
 
 		Storage: SealerConfig{
+			AllowSectorDownload:      true,
 			AllowAddPiece:            true,
 			AllowPreCommit1:          true,
 			AllowPreCommit2:          true,

node/config/doc_gen.go

@@ -796,11 +796,17 @@ This parameter is ONLY applicable if the retrieval pricing policy strategy has b
 
 			Comment: ``,
 		},
+		{
+			Num: "AllowSectorDownload",
+			Type: "bool",
+
+			Comment: ``,
+		},
 		{
 			Name: "AllowAddPiece",
 			Type: "bool",
 
-			Comment: `Local worker config`,
+			Comment: ``,
 		},
 		{
 			Name: "AllowPreCommit1",

node/config/storage.go

@@ -54,6 +54,7 @@ func WriteStorageFile(path string, config paths.StorageConfig) error {
 func (c *StorageMiner) StorageManager() sealer.Config {
 	return sealer.Config{
 		ParallelFetchLimit:       c.Storage.ParallelFetchLimit,
+		AllowSectorDownload:      c.Storage.AllowSectorDownload,
 		AllowAddPiece:            c.Storage.AllowAddPiece,
 		AllowPreCommit1:          c.Storage.AllowPreCommit1,
 		AllowPreCommit2:          c.Storage.AllowPreCommit2,

node/config/types.go

@@ -409,7 +409,7 @@ type SealingConfig struct {
 type SealerConfig struct {
 	ParallelFetchLimit int
 
-	// Local worker config
+	AllowSectorDownload      bool
 	AllowAddPiece            bool
 	AllowPreCommit1          bool
 	AllowPreCommit2          bool

storage/sealer/manager.go

@@ -108,6 +108,7 @@ type Config struct {
 	ParallelFetchLimit int
 
 	// Local worker config
+	AllowSectorDownload      bool
 	AllowAddPiece            bool
 	AllowPreCommit1          bool
 	AllowPreCommit2          bool
@@ -182,6 +183,9 @@ func New(ctx context.Context, lstor *paths.Local, stor paths.Store, ls paths.Loc
 	localTasks := []sealtasks.TaskType{
 		sealtasks.TTCommit1, sealtasks.TTProveReplicaUpdate1, sealtasks.TTFinalize, sealtasks.TTFetch, sealtasks.TTFinalizeReplicaUpdate,
 	}
+	if sc.AllowSectorDownload {
+		localTasks = append(localTasks, sealtasks.TTDownloadSector)
+	}
 	if sc.AllowAddPiece {
 		localTasks = append(localTasks, sealtasks.TTAddPiece, sealtasks.TTDataCid)
 	}