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

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +31 -22
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd6fef807b - Show all commits

8
storage/pipeline/states_replica_update.go
View File

@ -11,6 +11,7 @@ import (
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/builtin"
"github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/exitcode"
"github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/go-statemachine" "github.com/filecoin-project/go-statemachine"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
@ -170,7 +171,12 @@ func (m *Sealing) handleSubmitReplicaUpdate(ctx statemachine.Context, sector Sec
// figure out message type // figure out message type
pams, deals, err := m.processPieces(ctx.Context(), sector) nv, err := m.Api.StateNetworkVersion(ctx.Context(), ts.Key())
if err != nil {
log.Errorf("failed to get network version: %+v", err)
}
pams, deals, err := m.processPieces(ctx.Context(), sector, nv >= network.Version22)
if err != nil { if err != nil {
log.Errorf("failed to process pieces: %+v", err) log.Errorf("failed to process pieces: %+v", err)
return ctx.Send(SectorSubmitReplicaUpdateFailed{}) return ctx.Send(SectorSubmitReplicaUpdateFailed{})

45
storage/pipeline/states_sealing.go
View File

@ -748,30 +748,33 @@ func (m *Sealing) handleSubmitCommit(ctx statemachine.Context, sector SectorInfo
// processPieces returns either: // processPieces returns either:
// - a list of piece activation manifests // - a list of piece activation manifests
// - a list of deal IDs, if all non-filler pieces are deal-id pieces // - a list of deal IDs, if all non-filler pieces are deal-id pieces
func (m *Sealing) processPieces(ctx context.Context, sector SectorInfo) ([]miner.PieceActivationManifest, []abi.DealID, error) { func (m *Sealing) processPieces(ctx context.Context, sector SectorInfo, forceDDO bool) ([]miner.PieceActivationManifest, []abi.DealID, error) {
pams := make([]miner.PieceActivationManifest, 0, len(sector.Pieces)) pams := make([]miner.PieceActivationManifest, 0, len(sector.Pieces))
dealIDs := make([]abi.DealID, 0, len(sector.Pieces)) dealIDs := make([]abi.DealID, 0, len(sector.Pieces))
var hasDDO bool hasDDO := forceDDO
for _, piece := range sector.Pieces { if !forceDDO {
piece := piece // if not forcing DDO, check if we have any DDO pieces
for _, piece := range sector.Pieces {
piece := piece
// first figure out if this is a ddo sector // first figure out if this is a ddo sector
err := piece.handleDealInfo(handleDealInfoParams{ err := piece.handleDealInfo(handleDealInfoParams{
FillerHandler: func(info UniversalPieceInfo) error { FillerHandler: func(info UniversalPieceInfo) error {
// Fillers are implicit (todo review: Are they??) // Fillers are implicit (todo review: Are they??)
return nil return nil
}, },
BuiltinMarketHandler: func(info UniversalPieceInfo) error { BuiltinMarketHandler: func(info UniversalPieceInfo) error {
return nil return nil
}, },
DDOHandler: func(info UniversalPieceInfo) error { DDOHandler: func(info UniversalPieceInfo) error {
hasDDO = true hasDDO = true
return nil return nil
}, },
}) })
if err != nil { if err != nil {
return nil, nil, xerrors.Errorf("handleDealInfo: %w", err) return nil, nil, xerrors.Errorf("handleDealInfo: %w", err)
}
} }
} }
for _, piece := range sector.Pieces { for _, piece := range sector.Pieces {
@ -847,7 +850,7 @@ func (m *Sealing) handleSubmitCommitAggregate(ctx statemachine.Context, sector S
return ctx.Send(SectorCommitFailed{xerrors.Errorf("sector had nil commR or commD")}) return ctx.Send(SectorCommitFailed{xerrors.Errorf("sector had nil commR or commD")})
} }
pams, dealIDs, err := m.processPieces(ctx.Context(), sector) pams, dealIDs, err := m.processPieces(ctx.Context(), sector, false)
if err != nil { if err != nil {
return err return err
} }