gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file stat collection metric bug for the cluster.status command. (#8302)

Browse Source 
When the `--files` flag is present, `cluster.status` will scrape file metrics
from volume servers to provide detailed stats on those. The progress indicator
was not being updated properly though, so the command would complete before
it read 100%.
This commit is contained in:
Lisandro Pin
2026-02-11 22:34:20 +01:00
committed by GitHub
parent a3136c523f
commit 221bd237c4
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
weed/shell/command_cluster_status.go
View File

@@ -214,13 +214,13 @@ func (sp *ClusterStatusPrinter) loadFileStats(commandEnv *CommandEnv) error {
sp.regularVolumesStats = RegularVolumesStats{} sp.regularVolumesStats = RegularVolumesStats{}
sp.ecVolumesStats = EcVolumesStats{} sp.ecVolumesStats = EcVolumesStats{}
var mu sync.Mutex var statsMu, writerMu sync.Mutex
var progressTotal, progressDone uint64 var progressTotal, progressDone uint64
ewg := NewErrorWaitGroup(sp.maxParallelization) ewg := NewErrorWaitGroup(sp.maxParallelization)
updateProgress := func() { updateProgress := func() {
mu.Lock() writerMu.Lock()
defer mu.Unlock() defer writerMu.Unlock()
progressDone++ progressDone++
sp.write("collecting file stats: %s \r", sp.uint64Pct(progressDone, progressTotal)) sp.write("collecting file stats: %s \r", sp.uint64Pct(progressDone, progressTotal))
@@ -230,13 +230,15 @@ func (sp *ClusterStatusPrinter) loadFileStats(commandEnv *CommandEnv) error {
for _, ri := range dci.RackInfos { for _, ri := range dci.RackInfos {
for _, dni := range ri.DataNodeInfos { for _, dni := range ri.DataNodeInfos {
for _, d := range dni.DiskInfos { for _, d := range dni.DiskInfos {
mu.Lock() statsMu.Lock()
progressTotal += uint64(len(d.VolumeInfos)) progressTotal += uint64(len(d.VolumeInfos))
progressTotal += uint64(len(d.EcShardInfos)) progressTotal += uint64(len(d.EcShardInfos))
mu.Unlock() statsMu.Unlock()
for _, v := range d.VolumeInfos { for _, v := range d.VolumeInfos {
ewg.Add(func() error { ewg.Add(func() error {
defer updateProgress()
// Collect regular volume stats // Collect regular volume stats
err := operation.WithVolumeServerClient(false, pb.NewServerAddressWithGrpcPort(dni.Id, int(dni.GrpcPort)), commandEnv.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { err := operation.WithVolumeServerClient(false, pb.NewServerAddressWithGrpcPort(dni.Id, int(dni.GrpcPort)), commandEnv.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error {
resp, reqErr := volumeServerClient.VolumeStatus(context.Background(), &volume_server_pb.VolumeStatusRequest{ resp, reqErr := volumeServerClient.VolumeStatus(context.Background(), &volume_server_pb.VolumeStatusRequest{
@@ -246,8 +248,8 @@ func (sp *ClusterStatusPrinter) loadFileStats(commandEnv *CommandEnv) error {
return reqErr return reqErr
} }
mu.Lock() statsMu.Lock()
defer mu.Unlock() defer statsMu.Unlock()
if resp != nil { if resp != nil {
if _, ok := sp.regularVolumesStats[v.Id]; !ok { if _, ok := sp.regularVolumesStats[v.Id]; !ok {
sp.regularVolumesStats[v.Id] = []*VolumeReplicaStats{} sp.regularVolumesStats[v.Id] = []*VolumeReplicaStats{}
@@ -263,26 +265,24 @@ func (sp *ClusterStatusPrinter) loadFileStats(commandEnv *CommandEnv) error {
return nil return nil
}) })
updateProgress()
return err return err
}) })
} }
for _, eci := range d.EcShardInfos { for _, eci := range d.EcShardInfos {
ewg.Add(func() error { ewg.Add(func() error {
defer updateProgress()
// Collect EC shard stats // Collect EC shard stats
statsMu.Lock()
var err error
mu.Lock()
_, ok := sp.ecVolumesStats[eci.Id] _, ok := sp.ecVolumesStats[eci.Id]
mu.Unlock() statsMu.Unlock()
if ok { if ok {
// this EC volume has been already processed, likely on a different node // this EC volume has been already processed, likely on a different node
return nil return nil
} }
err = operation.WithVolumeServerClient(false, pb.NewServerAddressWithGrpcPort(dni.Id, int(dni.GrpcPort)), commandEnv.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { err := operation.WithVolumeServerClient(false, pb.NewServerAddressWithGrpcPort(dni.Id, int(dni.GrpcPort)), commandEnv.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error {
resp, reqErr := volumeServerClient.VolumeEcShardsInfo(context.Background(), &volume_server_pb.VolumeEcShardsInfoRequest{ resp, reqErr := volumeServerClient.VolumeEcShardsInfo(context.Background(), &volume_server_pb.VolumeEcShardsInfoRequest{
VolumeId: uint32(eci.Id), VolumeId: uint32(eci.Id),
}) })
@@ -290,8 +290,8 @@ func (sp *ClusterStatusPrinter) loadFileStats(commandEnv *CommandEnv) error {
return reqErr return reqErr
} }
mu.Lock() statsMu.Lock()
defer mu.Unlock() defer statsMu.Unlock()
if resp != nil { if resp != nil {
sp.ecVolumesStats[eci.Id] = &EcVolumeStats{ sp.ecVolumesStats[eci.Id] = &EcVolumeStats{
VolumeId: eci.Id, VolumeId: eci.Id,
@@ -303,7 +303,6 @@ func (sp *ClusterStatusPrinter) loadFileStats(commandEnv *CommandEnv) error {
return nil return nil
}) })
updateProgress()
return err return err
}) })
} }