7461ffe148
The query changes we did while fixing the usage graph led to wrong payout calculations directly linked to disk space. This change: - avoids converting from Bh to B directly in the query - returns the at_rest_total in the original bytes*hour value - returns at_rest_total_bytes as the calculated disk spaced used in bytes - uses the at_rest_total_bytes only for the disk space graph - return summary_bytes as the average disk space used within the specified date - updates the disk space graph header to "average disk space used this month" The total disk used in the month is also displayed in B not B*day Resolves https://github.com/storj/storj/issues/5355 Change-Id: I2cfefb0fe711f9c59de2adb547c4ab50b05c7cbb
48 lines
1.9 KiB
Go
48 lines
1.9 KiB
Go
// Copyright (C) 2019 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package storageusage
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"storj.io/common/storj"
|
|
)
|
|
|
|
// DB works with storage usage database.
|
|
//
|
|
// architecture: Database
|
|
type DB interface {
|
|
// Store stores storage usage stamps to db replacing conflicting entries
|
|
Store(ctx context.Context, stamps []Stamp) error
|
|
// GetDaily returns daily storage usage stamps for particular satellite
|
|
// for provided time range
|
|
GetDaily(ctx context.Context, satelliteID storj.NodeID, from, to time.Time) ([]Stamp, error)
|
|
// GetDailyTotal returns daily storage usage stamps summed across all known satellites
|
|
// for provided time range
|
|
GetDailyTotal(ctx context.Context, from, to time.Time) ([]Stamp, error)
|
|
// Summary returns aggregated storage usage across all satellites.
|
|
Summary(ctx context.Context, from, to time.Time) (float64, float64, error)
|
|
// SatelliteSummary returns aggregated storage usage for a particular satellite.
|
|
SatelliteSummary(ctx context.Context, satelliteID storj.NodeID, from, to time.Time) (float64, float64, error)
|
|
}
|
|
|
|
// Stamp is storage usage stamp for satellite from interval start till next interval.
|
|
type Stamp struct {
|
|
SatelliteID storj.NodeID `json:"-"`
|
|
// AtRestTotal is the bytes*hour disk space used at the IntervalEndTime.
|
|
AtRestTotal float64 `json:"atRestTotal"`
|
|
// AtRestTotalBytes is the AtRestTotal divided by the IntervalInHours.
|
|
AtRestTotalBytes float64 `json:"atRestTotalBytes"`
|
|
// IntervalInHours is hour difference between interval_end_time
|
|
// of this Stamp and that of the preceding Stamp
|
|
IntervalInHours float64 `json:"intervalInHours"`
|
|
// IntervalStart represents one tally day
|
|
// TODO: rename to timestamp to match DB
|
|
IntervalStart time.Time `json:"intervalStart"`
|
|
// IntervalEndTime represents the timestamp for the last tally run time
|
|
// (i.e. last interval_end_time) for the day
|
|
IntervalEndTime time.Time `json:"-"`
|
|
}
|