cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #5114 from filecoin-project/chore/update_sr2_stat_aggregation

Browse Source 
Chore/update sr2 stat aggregation
This commit is contained in:
Łukasz Magiera 2020-12-07 13:09:23 +01:00 committed by GitHub
commit b7975dcd9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/lotus-shed/sr2-dealstats-rollup.go
View File

@ -34,12 +34,14 @@ type competitionTotalOutput struct {
Payload competitionTotal `json:"payload"` Payload competitionTotal `json:"payload"`
} }
type competitionTotal struct { type competitionTotal struct {
UniqueCids int `json:"total_unique_cids"` UniqueCids int `json:"total_unique_cids"`
UniqueProviders int `json:"total_unique_providers"` UniqueProviders int `json:"total_unique_providers"`
UniqueProjects int `json:"total_unique_projects"` UniqueProjects int `json:"total_unique_projects"`
UniqueClients int `json:"total_unique_clients"` UniqueClients int `json:"total_unique_clients"`
TotalDeals int `json:"total_num_deals"` TotalDeals int `json:"total_num_deals"`
TotalBytes int64 `json:"total_stored_data_size"` 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 seenProject map[string]bool
seenClient map[address.Address]bool seenClient map[address.Address]bool
@ -245,11 +247,13 @@ var rollupDealStatsCmd = &cli.Command{
for dealID, dealInfo := range deals { for dealID, dealInfo := range deals {
// Counting no-longer-active deals as per Pooja's request // 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 // https://github.com/filecoin-project/specs-actors/blob/v0.9.9/actors/builtin/market/deal.go#L81-L85
// if d.State.SectorStartEpoch < 0 { // Bail on 0 as well in case SectorStartEpoch is uninitialized due to some bug
// continue if dealInfo.State.SectorStartEpoch <= 0 ||
// } dealInfo.State.SectorStartEpoch > head.Height() {
continue
}
clientAddr, found := resolvedWallets[dealInfo.Proposal.Client] clientAddr, found := resolvedWallets[dealInfo.Proposal.Client]
if !found { if !found {
@ -269,14 +273,23 @@ var rollupDealStatsCmd = &cli.Command{
unfilteredGrandTotals.seenPieceCid[dealInfo.Proposal.PieceCID] = true unfilteredGrandTotals.seenPieceCid[dealInfo.Proposal.PieceCID] = true
unfilteredGrandTotals.TotalDeals++ 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] projID, projKnown := knownAddrMap[clientAddr]
if !projKnown { if !projKnown {
continue continue
} }
grandTotals.seenProject[projID] = true grandTotals.seenProject[projID] = true
grandTotals.seenClient[clientAddr] = true
projStatEntry, ok := projStats[projID] projStatEntry, ok := projStats[projID]
if !ok { if !ok {
projStatEntry = &projectAggregateStats{ projStatEntry = &projectAggregateStats{
@ -288,6 +301,11 @@ var rollupDealStatsCmd = &cli.Command{
projStats[projID] = projStatEntry projStats[projID] = projStatEntry
} }
if projStatEntry.cidDeals[dealInfo.Proposal.PieceCID] >= 10 {
continue
}
grandTotals.seenClient[clientAddr] = true
clientStatEntry, ok := projStatEntry.ClientStats[clientAddr.String()] clientStatEntry, ok := projStatEntry.ClientStats[clientAddr.String()]
if !ok { if !ok {
clientStatEntry = &clientAggregateStats{ clientStatEntry = &clientAggregateStats{
@ -314,6 +332,11 @@ var rollupDealStatsCmd = &cli.Command{
projStatEntry.NumDeals++ projStatEntry.NumDeals++
clientStatEntry.NumDeals++ clientStatEntry.NumDeals++
if dealInfo.Proposal.VerifiedDeal {
grandTotals.FilplusTotalDeals++
grandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize)
}
payloadCid := "unknown" payloadCid := "unknown"
if c, err := cid.Parse(dealInfo.Proposal.Label); err == nil { if c, err := cid.Parse(dealInfo.Proposal.Label); err == nil {
payloadCid = c.String() payloadCid = c.String()