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

fix: recover from panics in LoadSectorStates #1115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: recover from panics in LoadSectorStates #1115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f15b8e
fix: recover from panics in LoadSectorStates
frrist Jan 19, 2023
2d6b073
fix: initalize SectorStates structure
frrist Jan 24, 2023
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
14 changes: 9 additions & 5 deletions tasks/actorstate/miner/sector_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,20 @@ type SectorStates struct {

// LoadSectorState loads all sectors from a miners partitions and returns a SectorStates structure containing individual
// bitfields for all active, live, faulty and recovering sector.
func LoadSectorState(ctx context.Context, state miner.State) (*SectorStates, error) {
func LoadSectorState(ctx context.Context, state miner.State) (sectorStates *SectorStates, err error) {
defer func() {
if r := recover(); r != nil {
err = fmt.Errorf("LoadSectorState panic: %s", r)
}
}()
_, span := otel.Tracer("").Start(ctx, "LoadSectorState")
defer span.End()

activeSectors := []bitfield.BitField{}
liveSectors := []bitfield.BitField{}
faultySectors := []bitfield.BitField{}
recoveringSectors := []bitfield.BitField{}
sectorStates = &SectorStates{}

// iterate the sector states
if err := state.ForEachDeadline(func(_ uint64, dl miner.Deadline) error {
Expand Down Expand Up @@ -329,8 +335,6 @@ func LoadSectorState(ctx context.Context, state miner.State) (*SectorStates, err
}); err != nil {
return nil, err
}
var err error
sectorStates := &SectorStates{}
if sectorStates.Active, err = bitfield.MultiMerge(activeSectors...); err != nil {
return nil, err
}
Expand Down Expand Up @@ -375,14 +379,14 @@ func DiffMinerSectorStates(ctx context.Context, extState extraction.State) (*Sec
grp.Go(func() error {
previous, err = LoadSectorState(grpCtx, extState.ParentState())
if err != nil {
return fmt.Errorf("loading previous sector states %w", err)
return fmt.Errorf("loading previous sector states for miner %s.(%s) with change type %s at height %d: %w", extState.Address(), extState.Actor().Code, extState.ChangeType(), extState.CurrentTipSet().Height(), err)
}
return nil
})
grp.Go(func() error {
current, err = LoadSectorState(grpCtx, extState.CurrentState())
if err != nil {
return fmt.Errorf("loading current sector states %w", err)
return fmt.Errorf("loading current sector states for miner %s.(%s) with change type %s at height %d: %w", extState.Address(), extState.Actor().Code, extState.ChangeType(), extState.CurrentTipSet().Height(), err)
}
return nil
})
Expand Down