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

feat: Add simple nv23 migration #258

Merged
merged 2 commits into from
May 2, 2024
Merged

feat: Add simple nv23 migration #258

merged 2 commits into from
May 2, 2024

Conversation

rjan90
Copy link
Contributor

@rjan90 rjan90 commented Apr 15, 2024 •
edited

Add simple nv23 migration

This was referenced Apr 15, 2024
Closed
Closed
@rjan90 rjan90 requested review from ZenGround0 and removed request for ZenGround0 May 1, 2024 18:48
@rjan90
Copy link
Contributor Author

rjan90 commented May 2, 2024

I ran this simple migration on a local devnet. And it worked fine:

Pre-Migration:

manifest cid: bafy2bzacecn7uxgehrqbcs462ktl2h23u23cmduy2etqj6xrd6tkkja56fna4
2024-05-02T09:59:16.039+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Started 5 workers
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Creating migration jobs
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Result writer started
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Done creating 17 migration jobs after 984.625µs
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 3 done
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 0 done
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 4 done
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 2 done
2024-05-02T09:59:16.040+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 1 done
2024-05-02T09:59:16.041+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Result writer wrote 17 results to state tree after 1.200375ms
2024-05-02T09:59:16.041+0200    INFO    fil-consensus   filcns/upgrades.go:2741 All workers done after 1.194708ms
2024-05-02T09:59:16.041+0200    INFO    fil-consensus   filcns/upgrades.go:2741 All 17 done after 1.384ms (12283/s)
2024-05-02T09:59:16.041+0200    WARN    statemgr        stmgr/forks.go:263      COMPLETED pre-migration {"duration": 0.004097291}

Migration:

2024-05-02T10:07:22.090+0200    WARN    statemgr        stmgr/forks.go:202      STARTING migration      {"height": "200", "from": "bafy2bzaceczcsmczvrmkdpic43tjts65rhzlkhfx75klvnh3o5mjdscionqvq"}
manifest cid: bafy2bzacecn7uxgehrqbcs462ktl2h23u23cmduy2etqj6xrd6tkkja56fna4
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Started 7 workers
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Creating migration jobs
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Result writer started
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Done creating 17 migration jobs after 59.084µs
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 1 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 0 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 3 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 4 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 2 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 6 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Worker 5 done
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 All workers done after 106.75µs
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 Result writer wrote 17 results to state tree after 115.542µs
2024-05-02T10:07:22.091+0200    INFO    fil-consensus   filcns/upgrades.go:2741 All 17 done after 121.084µs (140398/s)
2024-05-02T10:07:22.091+0200    WARN    statemgr        stmgr/forks.go:211      COMPLETED migration     {"height": "200", "from": "bafy2bzaceczcsmczvrmkdpic43tjts65rhzlkhfx75klvnh3o5mjdscionqvq", "to": "bafy2bzaceczcsmczvrmkdpic43tjts65rhzlkhfx75klvnh3o5mjdscionqvq", "duration": 0.000654625}

Network version:

lotus state network-version   
Network Version: 23

@rjan90 rjan90 changed the title [WIP] feat: Add simple nv23 migration feat: Add simple nv23 migration May 2, 2024
@rjan90 rjan90 marked this pull request as ready for review May 2, 2024 08:10
arajasek
arajasek reviewed May 2, 2024
View reviewed changes
Copy link
Collaborator

@arajasek arajasek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff here looks a little funny -- can we edit this to just be commit bf2c73a9f2a189e9661cf34af2cdd790a890aa2f applied on top of current master?

  1. git reset --hard master
  2. git cherry-pick bf2c73a9f2a189e9661cf34af2cdd790a890aa2f
  3. git push --force

should do it without any conflicts.

@rjan90
feat: Add simple nv23 migration
ae30e04 
feat: Add simple nv23 migration
@rjan90
Copy link
Contributor Author

rjan90 commented May 2, 2024

Thank you so much for the pointers! It now looks a lot cleaner.

@rjan90 rjan90 requested a review from ZenGround0 May 2, 2024 15:51
arajasek
arajasek approved these changes May 2, 2024
View reviewed changes
Copy link
Collaborator

@arajasek arajasek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with one nit (just the error message).

builtin/v14/migration/top.go Outdated Show resolved Hide resolved
@rjan90 @arajasek
Update builtin/v14/migration/top.go
538db91 
Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com>
@rjan90 rjan90 merged commit ad909a3 into master May 2, 2024
5 checks passed
@rjan90 rjan90 deleted the nv23-simple-migration branch May 2, 2024 17:48
@rjan90 rjan90 mentioned this pull request May 6, 2024
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arajasek arajasek arajasek approved these changes

@ZenGround0 ZenGround0 Awaiting requested review from ZenGround0

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rjan90 @arajasek