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

Implement pre-migration framework #5434

Merged
merged 21 commits into from
Jan 28, 2021
Merged

Implement pre-migration framework #5434

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8d3cc63
add support for running pre-migrations and caching their results
Stebalien Jan 26, 2021
8986a20
wire up re-migration logic for nv10
Stebalien Jan 26, 2021
8d05c5d
validate pre-migrations
Stebalien Jan 26, 2021
f65d179
make pre-migrations async
Stebalien Jan 26, 2021
77117a0
wait for pre-upgrades to exit on stop
Stebalien Jan 26, 2021
6362887
rename Upgrade to Migration where applicable
Stebalien Jan 26, 2021
b08abc1
fix error message
Stebalien Jan 26, 2021
32059d0
stmgr: only persist the migration cache on success
Stebalien Jan 27, 2021
05026a2
actually use the temp cache for pre-migrations
Stebalien Jan 27, 2021
ed3e086
register tipsets with the chainstore when testing
Stebalien Jan 27, 2021
4072f24
test pre-migrations
Stebalien Jan 27, 2021
35d6a40
cleanup pre-migration code a bit
Stebalien Jan 27, 2021
716f10e
remove unnecessary wrapper store in tests
Stebalien Jan 27, 2021
8543851
add additional pre-migration validations
Stebalien Jan 27, 2021
56054b0
sort pre-migrations
Stebalien Jan 27, 2021
9a03c00
fix sorted test
Stebalien Jan 27, 2021
9574db6
log in migration
Stebalien Jan 27, 2021
cffeb1a
fix doc comments
Stebalien Jan 27, 2021
bceb246
set worker counts for pre-migrations
Stebalien Jan 27, 2021
39d4f67
pre-migration: refactor timing specification
Stebalien Jan 27, 2021
4890d83
test: assert that pre-migrations are actually run
Stebalien Jan 28, 2021
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
23 changes: 6 additions & 17 deletions chain/gen/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/crypto"
"github.com/google/uuid"
block "github.com/ipfs/go-block-format"
"github.com/ipfs/go-blockservice"
"github.com/ipfs/go-cid"
offline "github.com/ipfs/go-ipfs-exchange-offline"
Expand Down Expand Up @@ -85,19 +84,6 @@ type ChainGen struct {
lr repo.LockedRepo
}

type mybs struct {
blockstore.Blockstore
}

func (m mybs) Get(c cid.Cid) (block.Block, error) {
b, err := m.Blockstore.Get(c)
if err != nil {
return nil, err
}

return b, nil
}

var rootkeyMultisig = genesis.MultisigMeta{
Signers: []address.Address{remAccTestKey},
Threshold: 1,
Expand Down Expand Up @@ -152,8 +138,6 @@ func NewGeneratorWithSectors(numSectors int) (*ChainGen, error) {
}
}()

bs = mybs{bs}

ks, err := lr.KeyStore()
if err != nil {
return nil, xerrors.Errorf("getting repo keystore failed: %w", err)
Expand Down Expand Up @@ -465,7 +449,12 @@ func (cg *ChainGen) NextTipSetFromMinersWithMessages(base *types.TipSet, miners
}
}

return store.NewFullTipSet(blks), nil
fts := store.NewFullTipSet(blks)
if err := cg.cs.PutTipSet(context.TODO(), fts.TipSet()); err != nil {
return nil, err
}

return fts, nil
}

func (cg *ChainGen) makeBlock(parents *types.TipSet, m address.Address, vrfticket *types.Ticket,
Expand Down
Loading