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

sealing: Address snap queue review

Browse Source
This commit is contained in:
Łukasz Magiera 2022-03-16 20:04:48 +01:00
parent e7ee5b5932
commit 724d80cf02
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extern/storage-sealing/input.go vendored
View File

@ -556,7 +556,10 @@ func (m *Sealing) tryGetUpgradeSector(ctx context.Context, sp abi.RegisteredSeal
return false, nil return false, nil
} }
ssize, _ := sp.SectorSize() // error already checked in the caller ssize, err := sp.SectorSize()
if err != nil {
return false, xerrors.Errorf("getting sector size: %w", err)
}
targetExpiration := m.calcTargetExpiration(ctx, ssize) targetExpiration := m.calcTargetExpiration(ctx, ssize)
var candidate abi.SectorID var candidate abi.SectorID
@ -592,7 +595,7 @@ func (m *Sealing) tryGetUpgradeSector(ctx context.Context, sp abi.RegisteredSeal
continue continue
} }
if expiration > targetExpiration && pledge.LessThan(bestPledge) { if expiration >= targetExpiration && pledge.LessThan(bestPledge) {
bestExpiration = expiration bestExpiration = expiration
bestPledge = pledge bestPledge = pledge
candidate = s candidate = s
@ -600,7 +603,7 @@ func (m *Sealing) tryGetUpgradeSector(ctx context.Context, sp abi.RegisteredSeal
} }
if bestExpiration == 0 { if bestExpiration == 0 {
// didn't find a good sector // didn't find a good sector / no sectors were available
return false, nil return false, nil
} }
@ -686,6 +689,11 @@ func (m *Sealing) StartPacking(sid abi.SectorNumber) error {
func (m *Sealing) AbortUpgrade(sid abi.SectorNumber) error { func (m *Sealing) AbortUpgrade(sid abi.SectorNumber) error {
m.startupWait.Wait() m.startupWait.Wait()
m.inputLk.Lock()
// always do this early
delete(m.available, m.minerSectorID(sid))
m.inputLk.Unlock()
log.Infow("aborting upgrade of sector", "sector", sid, "trigger", "user") log.Infow("aborting upgrade of sector", "sector", sid, "trigger", "user")
return m.sectors.Send(uint64(sid), SectorAbortUpgrade{xerrors.New("triggered by user")}) return m.sectors.Send(uint64(sid), SectorAbortUpgrade{xerrors.New("triggered by user")})
} }

6
itests/ccupgrade_test.go
View File

@ -49,9 +49,6 @@ func runTestCCUpgrade(t *testing.T) *kit.TestFullNode {
CCUpgrade := abi.SectorNumber(kit.DefaultPresealsPerBootstrapMiner + 1) CCUpgrade := abi.SectorNumber(kit.DefaultPresealsPerBootstrapMiner + 1)
fmt.Printf("CCUpgrade: %d\n", CCUpgrade) fmt.Printf("CCUpgrade: %d\n", CCUpgrade)
// wait for deadline 0 to pass so that committing starts after post on preseals
// this gives max time for post to complete minimizing chances of timeout
// waitForDeadline(ctx, t, 1, client, maddr)
miner.PledgeSectors(ctx, 1, 0, nil) miner.PledgeSectors(ctx, 1, 0, nil)
sl, err := miner.SectorsList(ctx) sl, err := miner.SectorsList(ctx)
require.NoError(t, err) require.NoError(t, err)
@ -142,9 +139,6 @@ func TestAbortUpgradeAvailable(t *testing.T) {
CCUpgrade := abi.SectorNumber(kit.DefaultPresealsPerBootstrapMiner + 1) CCUpgrade := abi.SectorNumber(kit.DefaultPresealsPerBootstrapMiner + 1)
fmt.Printf("CCUpgrade: %d\n", CCUpgrade) fmt.Printf("CCUpgrade: %d\n", CCUpgrade)
// wait for deadline 0 to pass so that committing starts after post on preseals
// this gives max time for post to complete minimizing chances of timeout
// waitForDeadline(ctx, t, 1, client, maddr)
miner.PledgeSectors(ctx, 1, 0, nil) miner.PledgeSectors(ctx, 1, 0, nil)
sl, err := miner.SectorsList(ctx) sl, err := miner.SectorsList(ctx)
require.NoError(t, err) require.NoError(t, err)