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

feat: allow checkpointing to forks

Browse Source 
Previously, `lotus sync checkpoint` would only checkpoint on the current
chain. Now, it can switch to a new fork.
This commit is contained in:
Steven Allen 2021-04-26 03:50:29 -07:00
parent 4688da5178
commit 69da6a2a29
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
chain/checkpoint.go
View File

@ -1,6 +1,7 @@
package chain package chain
import ( import (
"context"
"encoding/json" "encoding/json"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
@ -36,17 +37,20 @@ func loadCheckpoint(ds dtypes.MetadataDS) (types.TipSetKey, error) {
return tsk, err return tsk, err
} }
func (syncer *Syncer) SetCheckpoint(tsk types.TipSetKey) error { func (syncer *Syncer) SyncCheckpoint(ctx context.Context, tsk types.TipSetKey) error {
if tsk == types.EmptyTSK { if tsk == types.EmptyTSK {
return xerrors.Errorf("called with empty tsk") return xerrors.Errorf("called with empty tsk")
} }
syncer.checkptLk.Lock()
defer syncer.checkptLk.Unlock()
ts, err := syncer.ChainStore().LoadTipSet(tsk) ts, err := syncer.ChainStore().LoadTipSet(tsk)
if err != nil { if err != nil {
return xerrors.Errorf("cannot find tipset: %w", err) tss, err := syncer.Exchange.GetBlocks(ctx, tsk, 1)
if err != nil {
return xerrors.Errorf("failed to fetch tipset: %w", err)
} else if len(tss) != 1 {
return xerrors.Errorf("expected 1 tipset, got %d", len(tss))
}
ts = tss[0]
} }
hts := syncer.ChainStore().GetHeaviestTipSet() hts := syncer.ChainStore().GetHeaviestTipSet()
@ -54,11 +58,18 @@ func (syncer *Syncer) SetCheckpoint(tsk types.TipSetKey) error {
if err != nil { if err != nil {
return xerrors.Errorf("cannot determine whether checkpoint tipset is in main-chain: %w", err) return xerrors.Errorf("cannot determine whether checkpoint tipset is in main-chain: %w", err)
} }
if !hts.Equals(ts) && !anc { if !hts.Equals(ts) && !anc {
return xerrors.Errorf("cannot mark tipset as checkpoint, since it isn't in the main-chain: %w", err) if err := syncer.collectChain(ctx, ts, hts); err != nil {
return xerrors.Errorf("failed to collect chain for checkpoint: %w", err)
}
if err := syncer.ChainStore().SetHead(ts); err != nil {
return xerrors.Errorf("failed to set the chain head: %w", err)
}
} }
syncer.checkptLk.Lock()
defer syncer.checkptLk.Unlock()
tskBytes, err := json.Marshal(tsk) tskBytes, err := json.Marshal(tsk)
if err != nil { if err != nil {
return err return err
@ -69,6 +80,8 @@ func (syncer *Syncer) SetCheckpoint(tsk types.TipSetKey) error {
return err return err
} }
// TODO: This is racy. as there may be a concurrent sync in progress.
// The only real solution is to checkpoint inside the chainstore, not here.
syncer.checkpt = tsk syncer.checkpt = tsk
return nil return nil

2
node/impl/full/sync.go
View File

@ -104,7 +104,7 @@ func (a *SyncAPI) SyncIncomingBlocks(ctx context.Context) (<-chan *types.BlockHe
func (a *SyncAPI) SyncCheckpoint(ctx context.Context, tsk types.TipSetKey) error { func (a *SyncAPI) SyncCheckpoint(ctx context.Context, tsk types.TipSetKey) error {
log.Warnf("Marking tipset %s as checkpoint", tsk) log.Warnf("Marking tipset %s as checkpoint", tsk)
return a.Syncer.SetCheckpoint(tsk) return a.Syncer.SyncCheckpoint(ctx, tsk)
} }
func (a *SyncAPI) SyncMarkBad(ctx context.Context, bcid cid.Cid) error { func (a *SyncAPI) SyncMarkBad(ctx context.Context, bcid cid.Cid) error {