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

Fix TooManyMarkedForUpgrade

Browse Source
This commit is contained in:
zenground0 2022-01-09 08:53:22 +05:30 committed by Jennifer Wang
parent c6277922ac
commit a9a523d8c0
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extern/storage-sealing/upgrade_queue.go vendored
View File

@ -107,7 +107,6 @@ func (m *Sealing) MarkForSnapUpgrade(ctx context.Context, id abi.SectorNumber) e
"Upgrade expiration before marking for upgrade", id, onChainInfo.Expiration) "Upgrade expiration before marking for upgrade", id, onChainInfo.Expiration)
} }
log.Errorf("updating sector number %d", id)
return m.sectors.Send(uint64(id), SectorStartCCUpdate{}) return m.sectors.Send(uint64(id), SectorStartCCUpdate{})
} }

27
itests/ccupgrade_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/itests/kit" "github.com/filecoin-project/lotus/itests/kit"
@ -33,7 +34,7 @@ func TestCCUpgrade(t *testing.T) {
func runTestCCUpgrade(t *testing.T, upgradeHeight abi.ChainEpoch) *kit.TestFullNode { func runTestCCUpgrade(t *testing.T, upgradeHeight abi.ChainEpoch) *kit.TestFullNode {
ctx := context.Background() ctx := context.Background()
blockTime := 5 * time.Millisecond blockTime := 1 * time.Millisecond
client, miner, ens := kit.EnsembleMinimal(t, kit.GenesisNetworkVersion(network.Version15)) client, miner, ens := kit.EnsembleMinimal(t, kit.GenesisNetworkVersion(network.Version15))
ens.InterconnectAll().BeginMiningMustPost(blockTime) ens.InterconnectAll().BeginMiningMustPost(blockTime)
@ -50,7 +51,6 @@ func runTestCCUpgrade(t *testing.T, upgradeHeight abi.ChainEpoch) *kit.TestFullN
// this gives max time for post to complete minimizing chances of timeout // this gives max time for post to complete minimizing chances of timeout
// waitForDeadline(ctx, t, 1, client, maddr) // 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)
require.Len(t, sl, 1, "expected 1 sector") require.Len(t, sl, 1, "expected 1 sector")
@ -60,7 +60,6 @@ func runTestCCUpgrade(t *testing.T, upgradeHeight abi.ChainEpoch) *kit.TestFullN
require.NoError(t, err) require.NoError(t, err)
require.Less(t, 50000, int(si.Expiration)) require.Less(t, 50000, int(si.Expiration))
} }
waitForSectorActive(ctx, t, CCUpgrade, client, maddr) waitForSectorActive(ctx, t, CCUpgrade, client, maddr)
err = miner.SectorMarkForUpgrade(ctx, sl[0], true) err = miner.SectorMarkForUpgrade(ctx, sl[0], true)
@ -111,6 +110,18 @@ func waitForSectorActive(ctx context.Context, t *testing.T, sn abi.SectorNumber,
} }
} }
func waitForSectorStartUpgrade(ctx context.Context, t *testing.T, sn abi.SectorNumber, miner *kit.TestMiner) {
for {
si, err := miner.StorageMiner.SectorsStatus(ctx, sn, false)
require.NoError(t, err)
if si.State != api.SectorState("Proving") {
t.Logf("Done proving sector in state: %s", si.State)
return
}
}
}
func TestCCUpgradeAndPoSt(t *testing.T) { func TestCCUpgradeAndPoSt(t *testing.T) {
kit.QuietMiningLogs() kit.QuietMiningLogs()
t.Run("upgrade and then post", func(t *testing.T) { t.Run("upgrade and then post", func(t *testing.T) {
@ -120,6 +131,8 @@ func TestCCUpgradeAndPoSt(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
start := ts.Height() start := ts.Height()
// wait for a full proving period // wait for a full proving period
t.Log("waiting for chain")
n.WaitTillChain(ctx, func(ts *types.TipSet) bool { n.WaitTillChain(ctx, func(ts *types.TipSet) bool {
if ts.Height() > start+abi.ChainEpoch(2880) { if ts.Height() > start+abi.ChainEpoch(2880) {
return true return true
@ -133,10 +146,10 @@ func TestTooManyMarkedForUpgrade(t *testing.T) {
kit.QuietMiningLogs() kit.QuietMiningLogs()
ctx := context.Background() ctx := context.Background()
blockTime := 5 * time.Millisecond blockTime := 1 * time.Millisecond
client, miner, ens := kit.EnsembleMinimal(t, kit.GenesisNetworkVersion(network.Version15)) client, miner, ens := kit.EnsembleMinimal(t, kit.GenesisNetworkVersion(network.Version15))
ens.InterconnectAll().BeginMining(blockTime) ens.InterconnectAll().BeginMiningMustPost(blockTime)
maddr, err := miner.ActorAddress(ctx) maddr, err := miner.ActorAddress(ctx)
if err != nil { if err != nil {
@ -166,8 +179,10 @@ func TestTooManyMarkedForUpgrade(t *testing.T) {
err = miner.SectorMarkForUpgrade(ctx, CCUpgrade+1, true) err = miner.SectorMarkForUpgrade(ctx, CCUpgrade+1, true)
require.NoError(t, err) require.NoError(t, err)
waitForSectorStartUpgrade(ctx, t, CCUpgrade, miner)
waitForSectorStartUpgrade(ctx, t, CCUpgrade+1, miner)
err = miner.SectorMarkForUpgrade(ctx, CCUpgrade+2, true) err = miner.SectorMarkForUpgrade(ctx, CCUpgrade+2, true)
require.Error(t, err) require.Error(t, err)
assert.Contains(t, err.Error(), "no free resources to wait for deals") assert.Contains(t, err.Error(), "no free resources to wait for deals")
} }