|
|
@ -6,7 +6,6 @@ import ( |
|
|
|
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" |
|
|
|
"github.com/chrislusf/seaweedfs/weed/storage/needle" |
|
|
|
"github.com/prometheus/procfs" |
|
|
|
"github.com/prometheus/procfs/blockdevice" |
|
|
|
"math" |
|
|
|
"runtime" |
|
|
|
) |
|
|
@ -35,7 +34,6 @@ func (vs *VolumeServer) VacuumVolumeCompact(req *volume_server_pb.VacuumVolumeCo |
|
|
|
reportInterval := int64(1024 * 1024 * 128) |
|
|
|
nextReportTarget := reportInterval |
|
|
|
fs, fsErr := procfs.NewDefaultFS() |
|
|
|
bd, bdErr := blockdevice.NewDefaultFS() |
|
|
|
var sendErr error |
|
|
|
err := vs.store.CompactVolume(needle.VolumeId(req.VolumeId), req.Preallocate, vs.compactionBytePerSecond, func(processed int64) bool { |
|
|
|
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))) |
|
|
|
} |
|
|
|
} |
|
|
|
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 { |
|
|
|
return false |
|
|
|
} |
|
|
|