JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Dashboard calculation for used space and bandwidth usage (#1615)

Browse Source 
* Fix Dashboard calculation for used space and bandwidth usage

* Copy+Paste Err
This commit is contained in:
Stefan Benten 2019-03-30 14:16:08 +01:00 committed by GitHub
parent 872bd5d7c1
commit c50a21d4cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storagenode/inspector/inspector.go
View File

@ -55,10 +55,19 @@ func NewEndpoint(log *zap.Logger, pieceInfo pieces.DB, kademlia *kademlia.Kademl
} }
func (inspector *Endpoint) retrieveStats(ctx context.Context) (*pb.StatSummaryResponse, error) { func (inspector *Endpoint) retrieveStats(ctx context.Context) (*pb.StatSummaryResponse, error) {
// Space Usage
totalUsedSpace, err := inspector.pieceInfo.SpaceUsed(ctx) totalUsedSpace, err := inspector.pieceInfo.SpaceUsed(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
totalUsedSpaceOld, err := inspector.psdbDB.SumTTLSizes()
if err != nil {
return nil, err
}
totalUsedSpace += totalUsedSpaceOld
// Bandwidth Usage
usage, err := inspector.usageDB.Summary(ctx, getBeginningOfMonth(), time.Now()) usage, err := inspector.usageDB.Summary(ctx, getBeginningOfMonth(), time.Now())
if err != nil { if err != nil {
return nil, err return nil, err
@ -67,7 +76,7 @@ func (inspector *Endpoint) retrieveStats(ctx context.Context) (*pb.StatSummaryRe
egress := usage.Get + usage.GetAudit + usage.GetRepair egress := usage.Get + usage.GetAudit + usage.GetRepair
totalUsedBandwidth := int64(0) totalUsedBandwidth := int64(0)
oldUsage, err := inspector.psdbDB.SumTTLSizes() oldUsage, err := inspector.psdbDB.GetTotalBandwidthBetween(getBeginningOfMonth(), time.Now())
if err != nil { if err != nil {
inspector.log.Warn("unable to calculate old bandwidth usage") inspector.log.Warn("unable to calculate old bandwidth usage")
} else { } else {
@ -78,11 +87,11 @@ func (inspector *Endpoint) retrieveStats(ctx context.Context) (*pb.StatSummaryRe
return &pb.StatSummaryResponse{ return &pb.StatSummaryResponse{
UsedSpace: totalUsedSpace, UsedSpace: totalUsedSpace,
AvailableSpace: (inspector.config.AllocatedDiskSpace.Int64() - totalUsedSpace), AvailableSpace: inspector.config.AllocatedDiskSpace.Int64() - totalUsedSpace,
UsedIngress: ingress, UsedIngress: ingress,
UsedEgress: egress, UsedEgress: egress,
UsedBandwidth: totalUsedBandwidth, UsedBandwidth: totalUsedBandwidth,
AvailableBandwidth: (inspector.config.AllocatedBandwidth.Int64() - totalUsedBandwidth), AvailableBandwidth: inspector.config.AllocatedBandwidth.Int64() - totalUsedBandwidth,
}, nil }, nil
} }