diff --git a/CHANGELOG.md b/CHANGELOG.md index 32107f76e..e54438eba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ # UNRELEASED - chore: Auto remove local chain data when importing chain file or snapshot ([filecoin-project/lotus#11277](https://github.com/filecoin-project/lotus/pull/11277)) - feat: metric: export Mpool message count ([filecoin-project/lotus#11361](https://github.com/filecoin-project/lotus/pull/11361)) +- feat: sealing: load SectorsSummary from sealing SectorStats instead of calling API each time ([filecoin-project/lotus#11353](https://github.com/filecoin-project/lotus/pull/11353)) ## New features - feat: Added new tracing API (**HIGHLY EXPERIMENTAL**) supporting two RPC methods: `trace_block` and `trace_replayBlockTransactions` ([filecoin-project/lotus#11100](https://github.com/filecoin-project/lotus/pull/11100)) diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 6fd6045b4..25da71ef0 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -336,19 +336,9 @@ func (sm *StorageMinerAPI) SectorsListInStates(ctx context.Context, states []api return sns, nil } +// Use SectorsSummary from stats (prometheus) for faster result func (sm *StorageMinerAPI) SectorsSummary(ctx context.Context) (map[api.SectorState]int, error) { - sectors, err := sm.Miner.ListSectors() - if err != nil { - return nil, err - } - - out := make(map[api.SectorState]int) - for i := range sectors { - state := api.SectorState(sectors[i].State) - out[state]++ - } - - return out, nil + return sm.Miner.SectorsSummary(ctx), nil } func (sm *StorageMinerAPI) StorageLocal(ctx context.Context) (map[storiface.ID]string, error) { diff --git a/storage/pipeline/sealing.go b/storage/pipeline/sealing.go index 65d3fb14b..936bd8b39 100644 --- a/storage/pipeline/sealing.go +++ b/storage/pipeline/sealing.go @@ -304,6 +304,20 @@ func (m *Sealing) TerminateSector(ctx context.Context, sid abi.SectorNumber) err return m.sectors.Send(uint64(sid), SectorTerminate{}) } +func (m *Sealing) SectorsSummary(ctx context.Context) map[api.SectorState]int { + m.stats.lk.Lock() + defer m.stats.lk.Unlock() + + out := make(map[api.SectorState]int) + + for st, count := range m.stats.byState { + state := api.SectorState(st) + out[state] = int(count) + } + + return out +} + func (m *Sealing) TerminateFlush(ctx context.Context) (*cid.Cid, error) { return m.terminator.Flush(ctx) }