fix: avoid duplicate volume.list parent headers (#10126)

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
7y-9andCodex authored and GitHub committed 2026-06-29 11:31:45 -07:00
1 parent c06a2dca87
commit 1e42dd77ca
2 files changed
+38

No files matched your search

+10
View File
@@ -224,12 +224,17 @@ func (c *commandVolumeList) writeDataCenterInfo(writer io.Writer, t *master_pb.D
return strings.Compare(a.Id, b.Id)
})
dataCenterInfoFound := false
dataCenterHeaderPrinted := false
for _, r := range t.RackInfos {
if *c.rack != "" && *c.rack != r.Id {
continue
}
s.add(c.writeRackInfo(writer, r, verbosityLevel, func() {
if dataCenterHeaderPrinted {
return
}
output(verbosityLevel >= 1, writer, " DataCenter %s%s\n", t.Id, diskInfosToString(t.DiskInfos))
dataCenterHeaderPrinted = true
}))
if !dataCenterInfoFound && !s.isEmpty() {
dataCenterInfoFound = true
@@ -245,13 +250,18 @@ func (c *commandVolumeList) writeRackInfo(writer io.Writer, t *master_pb.RackInf
return strings.Compare(a.Id, b.Id)
})
rackInfoFound := false
rackHeaderPrinted := false
for _, dn := range t.DataNodeInfos {
if *c.dataNode != "" && *c.dataNode != dn.Id {
continue
}
s.add(c.writeDataNodeInfo(writer, dn, verbosityLevel, func() {
outCenterInfo()
if rackHeaderPrinted {
return
}
output(verbosityLevel >= 2, writer, " Rack %s%s\n", t.Id, diskInfosToString(t.DiskInfos))
rackHeaderPrinted = true
}))
if !rackInfoFound && !s.isEmpty() {
rackInfoFound = true