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

storageminer: Fix 'storage list' with disconnected storage

Browse Source
This commit is contained in:
Łukasz Magiera 2020-05-01 20:43:39 +02:00
parent c616e5e14e
commit f9be73c73e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/lotus-storage-miner/storage.go
View File

@ -142,22 +142,21 @@ var storageListCmd = &cli.Command{
return err return err
} }
sorted := make([]struct { type fsInfo struct {
stores.ID stores.ID
sectors []stores.Decl sectors []stores.Decl
stat stores.FsStat stat stores.FsStat
}, 0, len(st)) }
sorted := make([]fsInfo, 0, len(st))
for id, decls := range st { for id, decls := range st {
st, err := nodeApi.StorageStat(ctx, id) st, err := nodeApi.StorageStat(ctx, id)
if err != nil { if err != nil {
return err sorted = append(sorted, fsInfo{ID: id, sectors: decls})
continue
} }
sorted = append(sorted, struct { sorted = append(sorted, fsInfo{id, decls, st})
stores.ID
sectors []stores.Decl
stat stores.FsStat
}{id, decls, st})
} }
sort.Slice(sorted, func(i, j int) bool { sort.Slice(sorted, func(i, j int) bool {
@ -178,10 +177,13 @@ var storageListCmd = &cli.Command{
} }
} }
fmt.Printf("%s:\n", s.ID)
pingStart := time.Now() pingStart := time.Now()
st, err := nodeApi.StorageStat(ctx, s.ID) st, err := nodeApi.StorageStat(ctx, s.ID)
if err != nil { if err != nil {
return err fmt.Printf("\t%s: %s:\n", color.RedString("Error"), err)
continue
} }
ping := time.Now().Sub(pingStart) ping := time.Now().Sub(pingStart)
@ -199,7 +201,6 @@ var storageListCmd = &cli.Command{
set := (st.Capacity-st.Available)*barCols/st.Capacity set := (st.Capacity-st.Available)*barCols/st.Capacity
bar := strings.Repeat("|", int(set)) + strings.Repeat(" ", int(barCols-set)) bar := strings.Repeat("|", int(set)) + strings.Repeat(" ", int(barCols-set))
fmt.Printf("%s:\n", s.ID)
fmt.Printf("\t[%s] %s/%s %s\n", color.New(percCol).Sprint(bar), fmt.Printf("\t[%s] %s/%s %s\n", color.New(percCol).Sprint(bar),
types.SizeStr(types.NewInt(st.Capacity-st.Available)), types.SizeStr(types.NewInt(st.Capacity-st.Available)),
types.SizeStr(types.NewInt(st.Capacity)), types.SizeStr(types.NewInt(st.Capacity)),