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

strle, sealing: address review

Browse Source
This commit is contained in:
Łukasz Magiera 2022-08-25 10:19:39 -04:00
parent b8a8648f4a
commit 70f0edd041
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/strle/human.go
View File

@ -42,11 +42,7 @@ func HumanRangesToBitField(h string) (bitfield.BitField, error) {
} }
} }
if start < last { if start <= last && last > 0 {
return bitfield.BitField{}, xerrors.Errorf("run %d start(%d) was less than last run end(%d)", i, start, last)
}
if start == last && last > 0 {
return bitfield.BitField{}, xerrors.Errorf("run %d start(%d) was equal to last run end(%d)", i, start, last) return bitfield.BitField{}, xerrors.Errorf("run %d start(%d) was equal to last run end(%d)", i, start, last)
} }

10
storage/pipeline/numassign.go
View File

@ -98,7 +98,7 @@ func (m *Sealing) numAssignerMetaLocked(ctx context.Context) (api.NumAssignerMet
return api.NumAssignerMeta{}, xerrors.Errorf("loading allocated sectors bitfield: %w", err) return api.NumAssignerMeta{}, xerrors.Errorf("loading allocated sectors bitfield: %w", err)
} }
// if the allocated bitfield doesn't exist, crate it from the legacy sector counter // if the allocated bitfield doesn't exist, create it from the legacy sector counter
if allocated == nil { if allocated == nil {
var i uint64 var i uint64
{ {
@ -250,12 +250,12 @@ func (m *Sealing) numReserveLocked(ctx context.Context, name string, reserving b
} }
// check if the reservation is colliding with any other reservation // check if the reservation is colliding with any other reservation
coliding, err := bitfield.IntersectBitField(allReserved, reserving) colliding, err := bitfield.IntersectBitField(allReserved, reserving)
if err != nil { if err != nil {
return xerrors.Errorf("intersect all / reserving: %w", err) return xerrors.Errorf("intersect all / reserving: %w", err)
} }
empty, err := coliding.IsEmpty() empty, err := colliding.IsEmpty()
if err != nil { if err != nil {
return xerrors.Errorf("colliding.empty: %w", err) return xerrors.Errorf("colliding.empty: %w", err)
} }
@ -267,12 +267,12 @@ func (m *Sealing) numReserveLocked(ctx context.Context, name string, reserving b
} }
// check if the reservation is colliding with allocated sectors // check if the reservation is colliding with allocated sectors
coliding, err = bitfield.IntersectBitField(nm.Allocated, reserving) colliding, err = bitfield.IntersectBitField(nm.Allocated, reserving)
if err != nil { if err != nil {
return xerrors.Errorf("intersect all / reserving: %w", err) return xerrors.Errorf("intersect all / reserving: %w", err)
} }
empty, err = coliding.IsEmpty() empty, err = colliding.IsEmpty()
if err != nil { if err != nil {
return xerrors.Errorf("colliding.empty: %w", err) return xerrors.Errorf("colliding.empty: %w", err)
} }