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

Merge pull request #5477 from filecoin-project/fix/fork-logging

Browse Source 
Tune Migration
This commit is contained in:
Steven Allen 2021-01-28 20:12:13 -08:00 committed by GitHub
commit b4ad2e5e93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chain/stmgr/forks.go
View File

@ -261,13 +261,13 @@ func (sm *StateManager) handleStateForks(ctx context.Context, root cid.Cid, heig
u := sm.stateMigrations[height] u := sm.stateMigrations[height]
if u != nil && u.upgrade != nil { if u != nil && u.upgrade != nil {
startTime := time.Now() startTime := time.Now()
log.Warnw("STARTING migration", "height", height) log.Warnw("STARTING migration", "height", height, "from", root)
// Yes, we clone the cache, even for the final upgrade epoch. Why? Reverts. We may // Yes, we clone the cache, even for the final upgrade epoch. Why? Reverts. We may
// have to migrate multiple times. // have to migrate multiple times.
tmpCache := u.cache.Clone() tmpCache := u.cache.Clone()
retCid, err = u.upgrade(ctx, sm, tmpCache, cb, root, height, ts) retCid, err = u.upgrade(ctx, sm, tmpCache, cb, root, height, ts)
if err != nil { if err != nil {
log.Errorw("FAILED migration", "height", height, "error", err) log.Errorw("FAILED migration", "height", height, "from", root, "error", err)
return cid.Undef, err return cid.Undef, err
} }
// Yes, we update the cache, even for the final upgrade epoch. Why? Reverts. This // Yes, we update the cache, even for the final upgrade epoch. Why? Reverts. This
@ -276,6 +276,8 @@ func (sm *StateManager) handleStateForks(ctx context.Context, root cid.Cid, heig
u.cache.Update(tmpCache) u.cache.Update(tmpCache)
log.Warnw("COMPLETED migration", log.Warnw("COMPLETED migration",
"height", height, "height", height,
"from", root,
"to", retCid,
"duration", time.Since(startTime), "duration", time.Since(startTime),
) )
} }
@ -920,7 +922,12 @@ func UpgradeActorsV3(ctx context.Context, sm *StateManager, cache MigrationCache
workerCount = 1 workerCount = 1
} }
config := nv10.Config{MaxWorkers: uint(workerCount)} config := nv10.Config{
MaxWorkers: uint(workerCount),
JobQueueSize: 1000,
ResultQueueSize: 100,
ProgressLogPeriod: 10 * time.Second,
}
newRoot, err := upgradeActorsV3Common(ctx, sm, cache, root, epoch, ts, config) newRoot, err := upgradeActorsV3Common(ctx, sm, cache, root, epoch, ts, config)
if err != nil { if err != nil {
return cid.Undef, xerrors.Errorf("migrating actors v3 state: %w", err) return cid.Undef, xerrors.Errorf("migrating actors v3 state: %w", err)