Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore/update sr2 stat aggregation #5114

Merged
merged 4 commits into from
Dec 7, 2020
Merged

Chore/update sr2 stat aggregation #5114

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e6aa4b
Only count phase2 deals ( start epoch 166560 )
ribasushi Dec 3, 2020
88bd757
Only count the first 10 copies of the same piece per project
ribasushi Dec 3, 2020
2514c96
Count deals from sealed sectors only
ribasushi Dec 3, 2020
d9e3cc0
Add an extra filplus counter
ribasushi Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 36 additions & 13 deletions cmd/lotus-shed/sr2-dealstats-rollup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ type competitionTotalOutput struct {
Payload competitionTotal `json:"payload"`
}
type competitionTotal struct {
UniqueCids int `json:"total_unique_cids"`
UniqueProviders int `json:"total_unique_providers"`
UniqueProjects int `json:"total_unique_projects"`
UniqueClients int `json:"total_unique_clients"`
TotalDeals int `json:"total_num_deals"`
TotalBytes int64 `json:"total_stored_data_size"`
UniqueCids int `json:"total_unique_cids"`
UniqueProviders int `json:"total_unique_providers"`
UniqueProjects int `json:"total_unique_projects"`
UniqueClients int `json:"total_unique_clients"`
TotalDeals int `json:"total_num_deals"`
TotalBytes int64 `json:"total_stored_data_size"`
FilplusTotalDeals int `json:"filplus_total_num_deals"`
FilplusTotalBytes int64 `json:"filplus_total_stored_data_size"`

seenProject map[string]bool
seenClient map[address.Address]bool
Expand Down Expand Up @@ -245,11 +247,13 @@ var rollupDealStatsCmd = &cli.Command{

for dealID, dealInfo := range deals {

// Counting no-longer-active deals as per Pooja's request
// // https://github.com/filecoin-project/specs-actors/blob/v0.9.9/actors/builtin/market/deal.go#L81-L85
// if d.State.SectorStartEpoch < 0 {
// continue
// }
// Only count deals that have properly started, not past/future ones
// https://github.com/filecoin-project/specs-actors/blob/v0.9.9/actors/builtin/market/deal.go#L81-L85
// Bail on 0 as well in case SectorStartEpoch is uninitialized due to some bug
if dealInfo.State.SectorStartEpoch <= 0 ||
dealInfo.State.SectorStartEpoch > head.Height() {
continue
}

clientAddr, found := resolvedWallets[dealInfo.Proposal.Client]
if !found {
Expand All @@ -269,14 +273,23 @@ var rollupDealStatsCmd = &cli.Command{
unfilteredGrandTotals.seenPieceCid[dealInfo.Proposal.PieceCID] = true
unfilteredGrandTotals.TotalDeals++

if dealInfo.Proposal.VerifiedDeal {
unfilteredGrandTotals.FilplusTotalDeals++
unfilteredGrandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize)
}

// perl -E 'say scalar gmtime ( 166560 * 30 + 1598306400 )'
// Wed Oct 21 18:00:00 2020
if dealInfo.Proposal.StartEpoch <= 166560 {
continue
}

projID, projKnown := knownAddrMap[clientAddr]
if !projKnown {
continue
}

grandTotals.seenProject[projID] = true
grandTotals.seenClient[clientAddr] = true

projStatEntry, ok := projStats[projID]
if !ok {
projStatEntry = &projectAggregateStats{
Expand All @@ -288,6 +301,11 @@ var rollupDealStatsCmd = &cli.Command{
projStats[projID] = projStatEntry
}

if projStatEntry.cidDeals[dealInfo.Proposal.PieceCID] >= 10 {
continue
}

grandTotals.seenClient[clientAddr] = true
clientStatEntry, ok := projStatEntry.ClientStats[clientAddr.String()]
if !ok {
clientStatEntry = &clientAggregateStats{
Expand All @@ -314,6 +332,11 @@ var rollupDealStatsCmd = &cli.Command{
projStatEntry.NumDeals++
clientStatEntry.NumDeals++

if dealInfo.Proposal.VerifiedDeal {
grandTotals.FilplusTotalDeals++
grandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize)
}

payloadCid := "unknown"
if c, err := cid.Parse(dealInfo.Proposal.Label); err == nil {
payloadCid = c.String()
Expand Down