DAOS-16328 control: Update dmg pool list for MD-on-SSD #15490
+196
−67
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -112,50 +112,55 @@ func PrintPoolQueryTargetInfo(pqti *daos.PoolQueryTargetInfo, out io.Writer) err | |
| return w.Err | ||
| } | ||
|
|
||
| // Display info of NVMe or DATA tier in non-verbose mode. Show single tier if there is only one | ||
| // non-empty tier. | ||
| func poolListCreateRow(pool *daos.PoolInfo, upgradeNeeded, hasSpaceQuery bool) txtfmt.TableRow { | ||
| var size uint64 | ||
| var imbalance uint32 | ||
| var used int | ||
| poolUsage := pool.Usage() | ||
|
|
||
| if hasSpaceQuery && len(poolUsage) != 0 { | ||
| // Display stats of the last non-empty tier. | ||
| tierIdx := -1 | ||
| for ti := len(poolUsage) - 1; ti >= 0; ti-- { | ||
| if poolUsage[ti].Size > 0 { | ||
| tierIdx = ti | ||
| break | ||
| } | ||
| } | ||
| if tierIdx != -1 { | ||
| tier := poolUsage[tierIdx] | ||
| size = tier.Size | ||
| used = int((float64(size-tier.Free) / float64(size)) * 100) | ||
| if used < 0 { | ||
| used = 0 | ||
| } | ||
| imbalance = tier.Imbalance | ||
| } | ||
| } | ||
|
|
||
| row := txtfmt.TableRow{ | ||
| "Pool": pool.Name(), | ||
| "State": pool.State.String(), | ||
| } | ||
| if hasSpaceQuery { | ||
| row = txtfmt.TableRow{ | ||
| "Pool": pool.Name(), | ||
| "Size": humanize.Bytes(size), | ||
| "State": pool.State.String(), | ||
| "Used": fmt.Sprintf("%d%%", used), | ||
| "Imbalance": fmt.Sprintf("%d%%", imbalance), | ||
| "Disabled": fmt.Sprintf("%d/%d", pool.DisabledTargets, pool.TotalTargets), | ||
| } | ||
| } | ||
|
|
||
| if upgradeNeeded { | ||
| upgradeString := "None" | ||
|
|
||
| if pool.PoolLayoutVer != pool.UpgradeLayoutVer { | ||
| upgradeString = fmt.Sprintf("%d->%d", pool.PoolLayoutVer, | ||
| pool.UpgradeLayoutVer) | ||
| } | ||
| row["UpgradeNeeded?"] = upgradeString | ||
| } | ||
|
|
@@ -164,38 +169,74 @@ func poolListCreateRow(pool *daos.PoolInfo, upgrade bool) txtfmt.TableRow { | |
| } | ||
|
|
||
| func printPoolList(pools []*daos.PoolInfo, out io.Writer) error { | ||
| upgradeNeeded := false | ||
| hasSpaceQuery := false | ||
| for _, pool := range pools { | ||
| if upgradeNeeded && hasSpaceQuery { | ||
| break | ||
| } | ||
| if pool.PoolLayoutVer != pool.UpgradeLayoutVer { | ||
| upgradeNeeded = true | ||
| } | ||
| if pool.QueryMask.HasOption(daos.PoolQueryOptionSpace) { | ||
| hasSpaceQuery = true | ||
| } | ||
| } | ||
|
|
||
| titles := []string{"Pool", "State"} | ||
| if hasSpaceQuery { | ||
| titles = []string{"Pool", "Size", "State", "Used", "Imbalance", "Disabled"} | ||
| } | ||
| if upgradeNeeded { | ||
| titles = append(titles, "UpgradeNeeded?") | ||
| } | ||
| formatter := txtfmt.NewTableFormatter(titles...) | ||
|
|
||
| var table []txtfmt.TableRow | ||
| for _, pool := range pools { | ||
| table = append(table, poolListCreateRow(pool, upgradeNeeded, hasSpaceQuery)) | ||
| } | ||
|
|
||
| fmt.Fprintln(out, formatter.Format(table)) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func getRowUsageTitles(pool *daos.PoolInfo, hasMdOnSsd bool) []string { | ||
| titles := []string{} | ||
|
|
||
| for i, tu := range pool.Usage() { | ||
| tn := tu.TierName | ||
| if hasMdOnSsd { | ||
| if i == 0 { | ||
| tn = "Meta" | ||
| } else { | ||
| tn = "Data" | ||
| } | ||
| } | ||
| titles = append(titles, tn+" Size", tn+" Used", tn+" Imbalance") | ||
| } | ||
|
|
||
| return titles | ||
| } | ||
|
|
||
| func addVerboseTierUsage(pool *daos.PoolInfo, titles []string, row txtfmt.TableRow) txtfmt.TableRow { | ||
| var ti int | ||
|
|
||
| for _, tu := range pool.Usage() { | ||
| if len(titles) < ti+3 { | ||
| break | ||
| } | ||
| row[titles[ti]] = humanize.Bytes(tu.Size) | ||
| row[titles[ti+1]] = humanize.Bytes(tu.Size - tu.Free) | ||
| row[titles[ti+2]] = fmt.Sprintf("%d%%", tu.Imbalance) | ||
| ti += 3 | ||
| } | ||
|
|
||
| return row | ||
| } | ||
|
|
||
| func poolListCreateRowVerbose(pool *daos.PoolInfo, hasSpace, hasRebuild bool, usageTitles []string) txtfmt.TableRow { | ||
| label := pool.Label | ||
| if label == "" { | ||
| label = "-" | ||
|
|
@@ -226,9 +267,7 @@ func poolListCreateRowVerbose(pool *daos.PoolInfo, hasSpace, hasRebuild bool) tx | |
| } | ||
|
|
||
| if hasSpace { | ||
| row = addVerboseTierUsage(pool, usageTitles, row) | ||
| } | ||
|
|
||
| return row | ||
|
|
@@ -240,27 +279,26 @@ func printVerbosePoolList(pools []*daos.PoolInfo, out io.Writer) error { | |
|
|
||
| hasSpaceQuery := false | ||
| hasRebuildQuery := false | ||
| hasMdOnSsd := false | ||
| for _, pool := range pools { | ||
| if hasSpaceQuery && hasRebuildQuery { | ||
| break | ||
| } | ||
| if pool.QueryMask.HasOption(daos.PoolQueryOptionSpace) { | ||
| hasSpaceQuery = true | ||
| // All pools will have the same PMem/MD-on-SSD mode. | ||
| hasMdOnSsd = pool.MemFileBytes != 0 | ||
| } | ||
| if pool.QueryMask.HasOption(daos.PoolQueryOptionRebuild) { | ||
| hasRebuildQuery = true | ||
| } | ||
| } | ||
|
|
||
| // If any of the pools was queried, then we'll need to show more fields. | ||
| usageTitles := []string{} | ||
| if hasSpaceQuery { | ||
| usageTitles = getRowUsageTitles(pools[0], hasMdOnSsd) | ||
| titles = append(titles, usageTitles...) | ||
| titles = append(titles, "Disabled") | ||
| titles = append(titles, "UpgradeNeeded?") | ||
| } | ||
|
|
@@ -273,7 +311,8 @@ func printVerbosePoolList(pools []*daos.PoolInfo, out io.Writer) error { | |
|
|
||
| var table []txtfmt.TableRow | ||
| for _, pool := range pools { | ||
| table = append(table, | ||
| poolListCreateRowVerbose(pool, hasSpaceQuery, hasRebuildQuery, usageTitles)) | ||
| } | ||
|
|
||
| fmt.Fprintln(out, formatter.Format(table)) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the SCM-only case (admittedly a corner case at this point), nothing has changed, has it? May be worth calling out here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can update in a follow-on, the behaviour for PMem has changed because only NVMe tier is displayed in the default mode, as you have said nothing changes for SCM-only (and there is no equivalent supported mode for MD-on-SSD)