Merge pull request #8379 from filecoin-project/feat/proving-workers-cli

feat: miner cli: Separate proving workers command

cmd/lotus-miner/info_all.go

@@ -50,8 +50,13 @@ var infoAllCmd = &cli.Command{
 			fmt.Println("ERROR: ", err)
 		}
 
-		fmt.Println("\n#: Worker List")
+		fmt.Println("\n#: Sealing Worker List")
-		if err := sealingWorkersCmd.Action(cctx); err != nil {
+		if err := workersCmd(true).Action(cctx); err != nil {
+			fmt.Println("ERROR: ", err)
+		}
+
+		fmt.Println("\n#: Proving Worker List")
+		if err := workersCmd(false).Action(cctx); err != nil {
 			fmt.Println("ERROR: ", err)
 		}
 

cmd/lotus-miner/proving.go

@@ -30,6 +30,7 @@ var provingCmd = &cli.Command{
 		provingDeadlineInfoCmd,
 		provingFaultsCmd,
 		provingCheckProvableCmd,
+		workersCmd(false),
 	},
 }
 

cmd/lotus-miner/sealing.go

@@ -16,6 +16,7 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 
+	"github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
 	"github.com/filecoin-project/lotus/extern/sector-storage/storiface"
 
 	"github.com/filecoin-project/lotus/chain/types"
@@ -27,7 +28,7 @@ var sealingCmd = &cli.Command{
 	Usage: "interact with sealing pipeline",
 	Subcommands: []*cli.Command{
 		sealingJobsCmd,
-		sealingWorkersCmd,
+		workersCmd(true),
 		sealingSchedDiagCmd,
 		sealingAbortCmd,
 	},
@@ -47,7 +48,8 @@ func barString(total, y, g float64) string {
 	return barString
 }
 
-var sealingWorkersCmd = &cli.Command{
+func workersCmd(sealing bool) *cli.Command {
+	return &cli.Command{
 		Name:  "workers",
 		Usage: "list workers",
 		Flags: []cli.Flag{
@@ -82,6 +84,12 @@ var sealingWorkersCmd = &cli.Command{
 
 			st := make([]sortableStat, 0, len(stats))
 			for id, stat := range stats {
+				if len(stat.Tasks) > 0 {
+					if (stat.Tasks[0].WorkerType() != sealtasks.WorkerSealing) == sealing {
+						continue
+					}
+				}
+
 				st = append(st, sortableStat{id, stat})
 			}
 
@@ -148,6 +156,7 @@ var sealingWorkersCmd = &cli.Command{
 
 			return nil
 		},
+	}
 }
 
 var sealingJobsCmd = &cli.Command{

documentation/en/cli-lotus-miner.md

@@ -2040,6 +2040,7 @@ COMMANDS:
    deadline   View the current proving period deadline information by its index 
    faults     View the currently known proving faulty sectors information
    check      Check sectors provable
+   workers    list workers
    help, h    Shows a list of commands or help for one command
 
 OPTIONS:
@@ -2116,6 +2117,20 @@ OPTIONS:
    
 ```
 
+### lotus-miner proving workers
+```
+NAME:
+   lotus-miner proving workers - list workers
+
+USAGE:
+   lotus-miner proving workers [command options] [arguments...]
+
+OPTIONS:
+   --color     use color in display output (default: depends on output being a TTY)
+   --help, -h  show help (default: false)
+   
+```
+
 ## lotus-miner storage
 ```
 NAME: