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

fix: add lk.Lock() and move the map copy to avoid miner crash

Browse Source
This commit is contained in:
Florian RUEN 2023-11-03 11:49:45 +01:00
parent 02929dd166
commit c0c4e6bf35
No known key found for this signature in database
GPG Key ID: 6231FA69595430C7
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/impl/storminer.go
View File

@ -338,15 +338,7 @@ func (sm *StorageMinerAPI) SectorsListInStates(ctx context.Context, states []api
// Use SectorsSummary from stats (prometheus) for faster result
func (sm *StorageMinerAPI) SectorsSummary(ctx context.Context) (map[api.SectorState]int, error) {
sectorStats := sm.Miner.SectorsSummary(ctx)
out := make(map[api.SectorState]int)
for st, count := range sectorStats {
state := api.SectorState(st)
out[state] = int(count)
}
return out, nil
return sm.Miner.SectorsSummary(ctx), nil
}
func (sm *StorageMinerAPI) StorageLocal(ctx context.Context) (map[storiface.ID]string, error) {

14
storage/pipeline/sealing.go
View File

@ -304,8 +304,18 @@ 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[SectorState]int64 {
return m.stats.byState
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) {