From 6b3bc8c9d2a806f8b87dcb7e72b0b6350e8de922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 18 May 2022 12:19:27 +0200 Subject: [PATCH 1/2] feat: worker: lotus-worker run --no-default --- cmd/lotus-worker/main.go | 15 +++++++++++++-- documentation/en/cli-lotus-worker.md | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cmd/lotus-worker/main.go b/cmd/lotus-worker/main.go index 83c821105..f0fe993c7 100644 --- a/cmd/lotus-worker/main.go +++ b/cmd/lotus-worker/main.go @@ -182,12 +182,16 @@ var runCmd = &cli.Command{ Usage: "enable window post", Value: false, }, - &cli.BoolFlag{ Name: "winningpost", Usage: "enable winning post", Value: false, }, + &cli.BoolFlag{ + Name: "no-default", + Usage: "disable all default tasks, use the worker for storage only", + Value: false, + }, &cli.IntFlag{ Name: "parallel-fetch-limit", Usage: "maximum fetch operations to run in parallel", @@ -308,8 +312,11 @@ var runCmd = &cli.Command{ } if workerType == "" { - workerType = sealtasks.WorkerSealing taskTypes = append(taskTypes, sealtasks.TTFetch, sealtasks.TTCommit1, sealtasks.TTProveReplicaUpdate1, sealtasks.TTFinalize, sealtasks.TTFinalizeReplicaUpdate) + + if !cctx.Bool("no-default") { + workerType = sealtasks.WorkerSealing + } } if (workerType == sealtasks.WorkerSealing || cctx.IsSet("addpiece")) && cctx.Bool("addpiece") { @@ -337,6 +344,10 @@ var runCmd = &cli.Command{ taskTypes = append(taskTypes, sealtasks.TTRegenSectorKey) } + if cctx.Bool("no-default") && workerType == "" { + workerType = sealtasks.WorkerSealing + } + if len(taskTypes) == 0 { return xerrors.Errorf("no task types specified") } diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md index 68d0d45c2..6624cfa9d 100644 --- a/documentation/en/cli-lotus-worker.md +++ b/documentation/en/cli-lotus-worker.md @@ -49,6 +49,7 @@ OPTIONS: --regen-sector-key enable regen sector key (default: true) --windowpost enable window post (default: false) --winningpost enable winning post (default: false) + --no-default disable all default tasks, use the worker for storage only (default: false) --parallel-fetch-limit value maximum fetch operations to run in parallel (default: 5) --post-parallel-reads value maximum number of parallel challenge reads (0 = no limit) (default: 128) --post-read-timeout value time limit for reading PoSt challenges (0 = no limit) (default: 0s) From abf8316eda00bff42493c81e24c3dcb19a1c75f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Mon, 23 May 2022 18:52:40 +0200 Subject: [PATCH 2/2] worker: Less confusing usage on --no-default --- cmd/lotus-worker/main.go | 2 +- documentation/en/cli-lotus-worker.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/lotus-worker/main.go b/cmd/lotus-worker/main.go index f0fe993c7..8faabf70b 100644 --- a/cmd/lotus-worker/main.go +++ b/cmd/lotus-worker/main.go @@ -189,7 +189,7 @@ var runCmd = &cli.Command{ }, &cli.BoolFlag{ Name: "no-default", - Usage: "disable all default tasks, use the worker for storage only", + Usage: "disable all default compute tasks, use the worker for storage/fetching only", Value: false, }, &cli.IntFlag{ diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md index 6624cfa9d..dbc5e40c4 100644 --- a/documentation/en/cli-lotus-worker.md +++ b/documentation/en/cli-lotus-worker.md @@ -49,7 +49,7 @@ OPTIONS: --regen-sector-key enable regen sector key (default: true) --windowpost enable window post (default: false) --winningpost enable winning post (default: false) - --no-default disable all default tasks, use the worker for storage only (default: false) + --no-default disable all default compute tasks, use the worker for storage/fetching only (default: false) --parallel-fetch-limit value maximum fetch operations to run in parallel (default: 5) --post-parallel-reads value maximum number of parallel challenge reads (0 = no limit) (default: 128) --post-read-timeout value time limit for reading PoSt challenges (0 = no limit) (default: 0s)