Merge pull request #10280 from filecoin-project/asr/fix-shed

fix: shed: default to LOTUS_PATH for repo
2023-02-15 18:57:15 +01:00 · 2023-02-15 18:57:15 +01:00 · 2dd2edc1d3
commit 2dd2edc1d3
parent 6a90d32885 4f259d8644
21 changed files with 74 additions and 100 deletions
--- a/cmd/lotus-shed/balances.go
+++ b/cmd/lotus-shed/balances.go
@ -456,7 +456,6 @@ var chainBalanceStateCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name: "miner-info",
@ -680,7 +679,6 @@ var chainPledgeCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	ArgsUsage: "[stateroot epoch]",
--- a/cmd/lotus-shed/datastore.go
+++ b/cmd/lotus-shed/datastore.go
@ -41,11 +41,6 @@ var datastoreListCmd = &cli.Command{
 	Name:        "list",
 	Description: "list datastore keys",
 	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
 		&cli.StringFlag{
 			Name:  "repo-type",
 			Usage: "node type (FullNode, StorageMiner, Worker, Wallet)",
@ -115,11 +110,6 @@ var datastoreGetCmd = &cli.Command{
 	Name:        "get",
 	Description: "list datastore keys",
 	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
 		&cli.StringFlag{
 			Name:  "repo-type",
 			Usage: "node type (FullNode, StorageMiner, Worker, Wallet)",
@ -133,7 +123,7 @@ var datastoreGetCmd = &cli.Command{
 	},
 	ArgsUsage: "[namespace key]",
 	Action: func(cctx *cli.Context) error {
-		_ = logging.SetLogLevel("badger", "ERROR")
+		logging.SetLogLevel("badger", "ERROR") // nolint:errcheck

 		r, err := repo.NewFS(cctx.String("repo"))
 		if err != nil {
--- a/cmd/lotus-shed/deal-label.go
+++ b/cmd/lotus-shed/deal-label.go
@ -26,7 +26,6 @@ var dealLabelCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
--- a/cmd/lotus-shed/diff.go
+++ b/cmd/lotus-shed/diff.go
@ -35,7 +35,6 @@ var diffMinerStates = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
--- a/cmd/lotus-shed/export-car.go
+++ b/cmd/lotus-shed/export-car.go
@ -37,7 +37,6 @@ var exportCarCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	ArgsUsage: "[outfile] [root cid]",
--- a/cmd/lotus-shed/export.go
+++ b/cmd/lotus-shed/export.go
@ -44,7 +44,6 @@ var exportChainCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.StringFlag{
 			Name:  "tipset",
@ -149,7 +148,6 @@ var exportRawCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.StringFlag{
 			Name:  "car-size",
--- a/cmd/lotus-shed/fip-0036.go
+++ b/cmd/lotus-shed/fip-0036.go
@ -58,6 +58,12 @@ var fip36PollCmd = &cli.Command{
 	Name:      "fip36poll",
 	Usage:     "Process the FIP0036 FilPoll result",
 	ArgsUsage: "[state root, votes]",
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "repo",
+			Value: "~/.lotus",
+		},
+	},
 	Subcommands: []*cli.Command{
 		finalResultCmd,
 	},
@ -71,7 +77,6 @@ var finalResultCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},

--- a/cmd/lotus-shed/gas-estimation.go
+++ b/cmd/lotus-shed/gas-estimation.go
@ -44,7 +44,6 @@ var gasTraceCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
@ -149,7 +148,6 @@ var replayOfflineCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.Int64Flag{
 			Name:  "lookback-limit",
--- a/cmd/lotus-shed/import-car.go
+++ b/cmd/lotus-shed/import-car.go
@ -19,13 +19,6 @@ import (
 var importCarCmd = &cli.Command{
 	Name:        "import-car",
 	Description: "Import a car file into node chain blockstore",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
-	},
 	Action: func(cctx *cli.Context) error {
 		r, err := repo.NewFS(cctx.String("repo"))
 		if err != nil {
@ -103,13 +96,6 @@ var importCarCmd = &cli.Command{
 var importObjectCmd = &cli.Command{
 	Name:  "import-obj",
 	Usage: "import a raw ipld object into your datastore",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
-	},
 	Action: func(cctx *cli.Context) error {
 		r, err := repo.NewFS(cctx.String("repo"))
 		if err != nil {
--- a/cmd/lotus-shed/invariants.go
+++ b/cmd/lotus-shed/invariants.go
@ -37,7 +37,6 @@ var invariantsCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
--- a/cmd/lotus-shed/keyinfo.go
+++ b/cmd/lotus-shed/keyinfo.go
@ -146,14 +146,9 @@ var keyinfoImportCmd = &cli.Command{
   Examples

   env LOTUS_PATH=/var/lib/lotus lotus-shed keyinfo import libp2p-host.keyinfo`,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
-	},
 	Action: func(cctx *cli.Context) error {
+		flagRepo := cctx.String("repo")
+
 		var input io.Reader
 		if cctx.NArg() == 0 {
 			input = os.Stdin
@ -182,7 +177,7 @@ var keyinfoImportCmd = &cli.Command{
 			return err
 		}

-		fsrepo, err := repo.NewFS(cctx.String("repo"))
+		fsrepo, err := repo.NewFS(flagRepo)
 		if err != nil {
 			return err
 		}
--- a/cmd/lotus-shed/main.go
+++ b/cmd/lotus-shed/main.go
@ -1,6 +1,7 @@
 package main

 import (
+	"fmt"
 	"os"

 	logging "github.com/ipfs/go-log/v2"
@ -88,6 +89,19 @@ func main() {
 		Version:  build.UserVersion(),
 		Commands: local,
 		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "repo",
+				EnvVars: []string{"LOTUS_PATH"},
+				Hidden:  true,
+				Value:   "~/.lotus", // TODO: Consider XDG_DATA_HOME
+			},
+			&cli.StringFlag{
+				Name:    "miner-repo",
+				Aliases: []string{"storagerepo"},
+				EnvVars: []string{"LOTUS_MINER_PATH", "LOTUS_STORAGE_PATH"},
+				Value:   "~/.lotusminer", // TODO: Consider XDG_DATA_HOME
+				Usage:   fmt.Sprintf("Specify miner repo path. flag storagerepo and env LOTUS_STORAGE_PATH are DEPRECATION, will REMOVE SOON"),
+			},
 			&cli.StringFlag{
 				Name:  "log-level",
 				Value: "info",
--- a/cmd/lotus-shed/market.go
+++ b/cmd/lotus-shed/market.go
@ -125,8 +125,7 @@ var marketExportDatastoreCmd = &cli.Command{
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:  "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
+			Usage: "path to the repo",
 		},
 		&cli.StringFlag{
 			Name:  "backup-dir",
@ -243,8 +242,7 @@ var marketImportDatastoreCmd = &cli.Command{
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:  "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
+			Usage: "path to the repo",
 		},
 		&cli.StringFlag{
 			Name:     "backup-path",
--- a/cmd/lotus-shed/migrations.go
+++ b/cmd/lotus-shed/migrations.go
@ -56,7 +56,6 @@ var migrationsCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name: "skip-pre-migration",
--- a/cmd/lotus-shed/miner-peerid.go
+++ b/cmd/lotus-shed/miner-peerid.go
@ -26,12 +26,10 @@ import (

 var minerPeeridCmd = &cli.Command{
 	Name:  "miner-peerid",
-	Usage: "Scrape state to find a miner based on peerid",
-	Flags: []cli.Flag{
+	Usage: "Scrape state to find a miner based on peerid", Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
--- a/cmd/lotus-shed/miner-types.go
+++ b/cmd/lotus-shed/miner-types.go
@ -28,12 +28,10 @@ import (

 var minerTypesCmd = &cli.Command{
 	Name:  "miner-types",
-	Usage: "Scrape state to report on how many miners of each WindowPoStProofType exist",
-	Flags: []cli.Flag{
+	Usage: "Scrape state to report on how many miners of each WindowPoStProofType exist", Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
--- a/cmd/lotus-shed/msig.go
+++ b/cmd/lotus-shed/msig.go
@ -45,7 +45,6 @@ var multisigGetAllCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
--- a/cmd/lotus-shed/nonce-fix.go
+++ b/cmd/lotus-shed/nonce-fix.go
@ -17,6 +17,12 @@ import (
 var noncefix = &cli.Command{
 	Name: "noncefix",
 	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:    "repo",
+			EnvVars: []string{"LOTUS_PATH"},
+			Hidden:  true,
+			Value:   "~/.lotus", // TODO: Consider XDG_DATA_HOME
+		},
 		&cli.Uint64Flag{
 			Name: "start",
 		},
--- a/cmd/lotus-shed/pruning.go
+++ b/cmd/lotus-shed/pruning.go
@ -88,7 +88,6 @@ var stateTreePruneCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.Int64Flag{
 			Name:  "keep-from-lookback",
--- a/cmd/lotus-shed/splitstore.go
+++ b/cmd/lotus-shed/splitstore.go
@ -41,7 +41,6 @@ var splitstoreRollbackCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name:  "gc-coldstore",
@ -132,7 +131,6 @@ var splitstoreClearCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name:  "keys-only",
--- a/cmd/lotus-shed/terminations.go
+++ b/cmd/lotus-shed/terminations.go
@ -35,7 +35,6 @@ var terminationsCmd = &cli.Command{
 		&cli.StringFlag{
 			Name:  "repo",
 			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {