gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

revert disk stats

Browse source
This commit is contained in:
Konstantin Lebedev 2022-08-01 14:29:41 +05:00
parent 2f0dda384d
commit 1d29f67c02
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
weed/server/volume_grpc_vacuum.go
View file

@ -6,7 +6,6 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/prometheus/procfs" "github.com/prometheus/procfs"
"github.com/prometheus/procfs/blockdevice"
"math" "math"
"runtime" "runtime"
) )
@ -35,7 +34,6 @@ func (vs *VolumeServer) VacuumVolumeCompact(req *volume_server_pb.VacuumVolumeCo
reportInterval := int64(1024 * 1024 * 128) reportInterval := int64(1024 * 1024 * 128)
nextReportTarget := reportInterval nextReportTarget := reportInterval
fs, fsErr := procfs.NewDefaultFS() fs, fsErr := procfs.NewDefaultFS()
bd, bdErr := blockdevice.NewDefaultFS()
var sendErr error var sendErr error
err := vs.store.CompactVolume(needle.VolumeId(req.VolumeId), req.Preallocate, vs.compactionBytePerSecond, func(processed int64) bool { err := vs.store.CompactVolume(needle.VolumeId(req.VolumeId), req.Preallocate, vs.compactionBytePerSecond, func(processed int64) bool {
if processed > nextReportTarget { if processed > nextReportTarget {
@ -45,13 +43,6 @@ func (vs *VolumeServer) VacuumVolumeCompact(req *volume_server_pb.VacuumVolumeCo
resp.PercentLoadAvg_1M = uint32(math.Round(fsLa.Load1 * 100 / float64(numCPU))) resp.PercentLoadAvg_1M = uint32(math.Round(fsLa.Load1 * 100 / float64(numCPU)))
} }
} }
if bdErr == nil {
if bdStats, err := bd.ProcDiskstats(); err == nil {
for _, stat := range bdStats {
glog.V(0).Infof("vacuum id: processed ProcDiskstats: %+v", req.VolumeId, stat)
}
}
}
if sendErr = stream.Send(resp); sendErr != nil { if sendErr = stream.Send(resp); sendErr != nil {
return false return false
} }

2
weed/topology/topology_vacuum.go
View file

@ -89,7 +89,7 @@ func (t *Topology) batchVacuumVolumeCompact(grpcDialOption grpc.DialOption, vl *
return recvErr return recvErr
} }
} }
glog.V(0).Infof("%d vacuum %d on %s processed %d bytes, percentage loadAvg %v", glog.V(0).Infof("%d vacuum %d on %s processed %d bytes, loadAvg %v%%",
index, vid, url, resp.ProcessedBytes, resp.PercentLoadAvg_1M) index, vid, url, resp.ProcessedBytes, resp.PercentLoadAvg_1M)
} }
return nil return nil