cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #10232 from filecoin-project/worker-all-task-flag2

Browse Source 
fix: worker: add all tasks flag
This commit is contained in:
Łukasz Magiera 2023-02-10 12:59:47 +01:00 committed by GitHub
commit 7aa6663127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
cmd/lotus-worker/tasks.go
View File

@ -44,33 +44,53 @@ var settableStr = func() string {
var tasksEnableCmd = &cli.Command{ var tasksEnableCmd = &cli.Command{
Name: "enable", Name: "enable",
Usage: "Enable a task type", Usage: "Enable a task type",
ArgsUsage: "[" + settableStr + "]", ArgsUsage: "--all | [" + settableStr + "]",
Action: taskAction(api.Worker.TaskEnable), Flags: []cli.Flag{
&cli.BoolFlag{
Name: "all",
Usage: "Enable all task types",
},
},
Action: taskAction(api.Worker.TaskEnable),
} }
var tasksDisableCmd = &cli.Command{ var tasksDisableCmd = &cli.Command{
Name: "disable", Name: "disable",
Usage: "Disable a task type", Usage: "Disable a task type",
ArgsUsage: "[" + settableStr + "]", ArgsUsage: "--all | [" + settableStr + "]",
Action: taskAction(api.Worker.TaskDisable), Flags: []cli.Flag{
&cli.BoolFlag{
Name: "all",
Usage: "Disable all task types",
},
},
Action: taskAction(api.Worker.TaskDisable),
} }
func taskAction(tf func(a api.Worker, ctx context.Context, tt sealtasks.TaskType) error) func(cctx *cli.Context) error { func taskAction(tf func(a api.Worker, ctx context.Context, tt sealtasks.TaskType) error) func(cctx *cli.Context) error {
return func(cctx *cli.Context) error { return func(cctx *cli.Context) error {
if cctx.NArg() != 1 { allFlag := cctx.Bool("all")
return xerrors.Errorf("expected 1 argument")
if cctx.NArg() == 1 && allFlag {
return xerrors.Errorf("Cannot use --all flag with task type argument")
}
if cctx.NArg() != 1 && !allFlag {
return xerrors.Errorf("Expected 1 argument or use --all flag")
} }
var tt sealtasks.TaskType var tt sealtasks.TaskType
for taskType := range allowSetting { if cctx.NArg() == 1 {
if taskType.Short() == cctx.Args().First() { for taskType := range allowSetting {
tt = taskType if taskType.Short() == cctx.Args().First() {
break tt = taskType
break
}
} }
}
if tt == "" { if tt == "" {
return xerrors.Errorf("unknown task type '%s'", cctx.Args().First()) return xerrors.Errorf("unknown task type '%s'", cctx.Args().First())
}
} }
api, closer, err := lcli.GetWorkerAPI(cctx) api, closer, err := lcli.GetWorkerAPI(cctx)
@ -81,6 +101,15 @@ func taskAction(tf func(a api.Worker, ctx context.Context, tt sealtasks.TaskType
ctx := lcli.ReqContext(cctx) ctx := lcli.ReqContext(cctx)
if allFlag {
for taskType := range allowSetting {
if err := tf(api, ctx, taskType); err != nil {
return err
}
}
return nil
}
return tf(api, ctx, tt) return tf(api, ctx, tt)
} }
} }

8
documentation/en/cli-lotus-worker.md
View File

@ -218,10 +218,10 @@ NAME:
lotus-worker tasks enable - Enable a task type lotus-worker tasks enable - Enable a task type
USAGE: USAGE:
lotus-worker tasks enable [command options] [UNS|C2|PC2|PC1|PR2|RU|AP|DC|GSK] lotus-worker tasks enable [command options] --all | [UNS|C2|PC2|PC1|PR2|RU|AP|DC|GSK]
OPTIONS: OPTIONS:
--help, -h show help (default: false) --all Enable all task types (default: false)
``` ```
@ -231,9 +231,9 @@ NAME:
lotus-worker tasks disable - Disable a task type lotus-worker tasks disable - Disable a task type
USAGE: USAGE:
lotus-worker tasks disable [command options] [UNS|C2|PC2|PC1|PR2|RU|AP|DC|GSK] lotus-worker tasks disable [command options] --all | [UNS|C2|PC2|PC1|PR2|RU|AP|DC|GSK]
OPTIONS: OPTIONS:
--help, -h show help (default: false) --all Disable all task types (default: false)
``` ```