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

ffiwrapper: Synth cleanup fixes

Browse Source
This commit is contained in:
Łukasz Magiera 2023-07-12 13:43:36 +02:00
parent a43f066b55
commit c7dd001c64
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/sealer/ffiwrapper/sealer_cgo.go
View File

@ -871,13 +871,13 @@ func (sb *Sealer) SealPreCommit2(ctx context.Context, sector storiface.SectorRef
[]abi.PieceInfo{{Size: abi.PaddedPieceSize(ssize), PieceCID: unsealedCID}}) []abi.PieceInfo{{Size: abi.PaddedPieceSize(ssize), PieceCID: unsealedCID}})
if err != nil { if err != nil {
log.Warn("GenerateSynthProofs() failed: ", err) log.Warn("GenerateSynthProofs() failed: ", err)
log.Warnf("num:%d tkt:%v seed:%v sealedCID:%v, unsealedCID:%v", sector.ID.Number, ticket, sealedCID, unsealedCID) log.Warnf("num:%d tkt:%v, sealedCID:%v, unsealedCID:%v", sector.ID.Number, ticket, sealedCID, unsealedCID)
return storiface.SectorCids{}, xerrors.Errorf("checking PreCommit failed: %w", err) return storiface.SectorCids{}, xerrors.Errorf("generate synth proofs: %w", err)
} }
if err = ffi.ClearLayerData(ssize, paths.Cache); err != nil { if err = ffi.ClearLayerData(ssize, paths.Cache); err != nil {
log.Warn("failed to GenerateSynthProofs(): ", err) log.Warn("failed to GenerateSynthProofs(): ", err)
log.Warnf("num:%d tkt:%v seed:%v sealedCID:%v, unsealedCID:%v", sector.ID.Number, ticket, sealedCID, unsealedCID) log.Warnf("num:%d tkt:%v, sealedCID:%v, unsealedCID:%v", sector.ID.Number, ticket, sealedCID, unsealedCID)
return storiface.SectorCids{ return storiface.SectorCids{
Unsealed: unsealedCID, Unsealed: unsealedCID,
Sealed: sealedCID, Sealed: sealedCID,
@ -1152,7 +1152,7 @@ func (sb *Sealer) FinalizeSectorInto(ctx context.Context, sector storiface.Secto
} }
if abi.Synthetic[sector.ProofType] { if abi.Synthetic[sector.ProofType] {
if err = ffi.ClearSyntheticProofs(uint64(ssize), paths.Cache); err != nil { if err = ffi.ClearSyntheticProofs(uint64(ssize), dest); err != nil {
log.Warn("Unable to delete Synth cache:", err) log.Warn("Unable to delete Synth cache:", err)
// Pass-Thru on error. // Pass-Thru on error.
} }
@ -1174,6 +1174,12 @@ func (sb *Sealer) FinalizeReplicaUpdate(ctx context.Context, sector storiface.Se
} }
defer done() defer done()
if abi.Synthetic[sector.ProofType] {
if err = ffi.ClearSyntheticProofs(uint64(ssize), paths.Cache); err != nil {
return xerrors.Errorf("clear synth cache: %w", err)
}
}
if err := ffi.ClearCache(uint64(ssize), paths.Cache); err != nil { if err := ffi.ClearCache(uint64(ssize), paths.Cache); err != nil {
return xerrors.Errorf("clear cache: %w", err) return xerrors.Errorf("clear cache: %w", err)
} }
@ -1186,12 +1192,7 @@ func (sb *Sealer) FinalizeReplicaUpdate(ctx context.Context, sector storiface.Se
} }
defer done() defer done()
if abi.Synthetic[sector.ProofType] { // note: synth cache is not a thing for snapdeals
if err = ffi.ClearSyntheticProofs(uint64(ssize), paths.Cache); err != nil {
log.Warn("Unable to delete Synth cache:", err)
// Pass-Thru on error.
}
}
if err := ffi.ClearCache(uint64(ssize), paths.UpdateCache); err != nil { if err := ffi.ClearCache(uint64(ssize), paths.UpdateCache); err != nil {
return xerrors.Errorf("clear cache: %w", err) return xerrors.Errorf("clear cache: %w", err)