From c2fa54ca9c5ca4f44bc48d003ce3b26ba768f13a Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Thu, 30 Sep 2021 12:43:02 +0200 Subject: [PATCH 1/2] check for deal start epoch on SectorAddPieceToAny --- extern/storage-sealing/input.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/extern/storage-sealing/input.go b/extern/storage-sealing/input.go index 218616aea19..bdd03884a9e 100644 --- a/extern/storage-sealing/input.go +++ b/extern/storage-sealing/input.go @@ -274,6 +274,16 @@ func (m *Sealing) SectorAddPieceToAny(ctx context.Context, size abi.UnpaddedPiec return api.SectorOffset{}, xerrors.Errorf("getting proposal CID: %w", err) } + _, head, err := m.Api.ChainHead(ctx) + if err != nil { + return api.SectorOffset{}, xerrors.Errorf("couldnt get chain head: %w", err) + } + if head > deal.DealProposal.StartEpoch { + return api.SectorOffset{}, xerrors.Errorf( + "cannot add piece for deal with piece CID %s: current epoch %d has passed deal proposal start epoch %d", + deal.DealProposal.PieceCID, head, deal.DealProposal.StartEpoch) + } + m.inputLk.Lock() if _, exist := m.pendingPieces[proposalCID(deal)]; exist { m.inputLk.Unlock() From 809289f5effd301714ba7e245184e96d7e892c64 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Thu, 30 Sep 2021 14:35:23 +0200 Subject: [PATCH 2/2] add Dealmaking.StartEpochSealingBuffer config --- .../en/default-lotus-miner-config.toml | 6 ++++ extern/storage-sealing/input.go | 7 ++++- extern/storage-sealing/sealiface/config.go | 2 ++ markets/storageadapter/dealpublisher.go | 28 +++++++++++-------- node/builder_miner.go | 5 ++-- node/config/def.go | 2 ++ node/config/doc_gen.go | 6 ++++ node/config/types.go | 2 ++ node/modules/storageminer.go | 2 ++ 9 files changed, 45 insertions(+), 15 deletions(-) diff --git a/documentation/en/default-lotus-miner-config.toml b/documentation/en/default-lotus-miner-config.toml index e95fd9dd49d..7748d94c46c 100644 --- a/documentation/en/default-lotus-miner-config.toml +++ b/documentation/en/default-lotus-miner-config.toml @@ -207,6 +207,12 @@ # env var: LOTUS_DEALMAKING_SIMULTANEOUSTRANSFERS #SimultaneousTransfers = 20 + # Minimum start epoch buffer to give time for sealing of sector with deal. + # + # type: uint64 + # env var: LOTUS_DEALMAKING_STARTEPOCHSEALINGBUFFER + #StartEpochSealingBuffer = 480 + # A command used for fine-grained evaluation of storage deals # see https://docs.filecoin.io/mine/lotus/miner-configuration/#using-filters-for-fine-grained-storage-and-retrieval-deal-acceptance for more details # diff --git a/extern/storage-sealing/input.go b/extern/storage-sealing/input.go index bdd03884a9e..361907b2753 100644 --- a/extern/storage-sealing/input.go +++ b/extern/storage-sealing/input.go @@ -274,11 +274,16 @@ func (m *Sealing) SectorAddPieceToAny(ctx context.Context, size abi.UnpaddedPiec return api.SectorOffset{}, xerrors.Errorf("getting proposal CID: %w", err) } + cfg, err := m.getConfig() + if err != nil { + return api.SectorOffset{}, xerrors.Errorf("getting config: %w", err) + } + _, head, err := m.Api.ChainHead(ctx) if err != nil { return api.SectorOffset{}, xerrors.Errorf("couldnt get chain head: %w", err) } - if head > deal.DealProposal.StartEpoch { + if head+cfg.StartEpochSealingBuffer > deal.DealProposal.StartEpoch { return api.SectorOffset{}, xerrors.Errorf( "cannot add piece for deal with piece CID %s: current epoch %d has passed deal proposal start epoch %d", deal.DealProposal.PieceCID, head, deal.DealProposal.StartEpoch) diff --git a/extern/storage-sealing/sealiface/config.go b/extern/storage-sealing/sealiface/config.go index 95b851609c8..bedb890859c 100644 --- a/extern/storage-sealing/sealiface/config.go +++ b/extern/storage-sealing/sealiface/config.go @@ -22,6 +22,8 @@ type Config struct { CommittedCapacitySectorLifetime time.Duration + StartEpochSealingBuffer abi.ChainEpoch + AlwaysKeepUnsealedCopy bool FinalizeEarly bool diff --git a/markets/storageadapter/dealpublisher.go b/markets/storageadapter/dealpublisher.go index 7508a5d3303..65a57d7ce24 100644 --- a/markets/storageadapter/dealpublisher.go +++ b/markets/storageadapter/dealpublisher.go @@ -59,10 +59,11 @@ type DealPublisher struct { publishPeriod time.Duration publishSpec *api.MessageSendSpec - lk sync.Mutex - pending []*pendingDeal - cancelWaitForMoreDeals context.CancelFunc - publishPeriodStart time.Time + lk sync.Mutex + pending []*pendingDeal + cancelWaitForMoreDeals context.CancelFunc + publishPeriodStart time.Time + startEpochSealingBuffer abi.ChainEpoch } // A deal that is queued to be published @@ -93,6 +94,8 @@ type PublishMsgConfig struct { // The maximum number of deals to include in a single PublishStorageDeals // message MaxDealsPerMsg uint64 + // Minimum start epoch buffer to give time for sealing of sector with deal + StartEpochSealingBuffer uint64 } func NewDealPublisher( @@ -124,13 +127,14 @@ func newDealPublisher( ) *DealPublisher { ctx, cancel := context.WithCancel(context.Background()) return &DealPublisher{ - api: dpapi, - as: as, - ctx: ctx, - Shutdown: cancel, - maxDealsPerPublishMsg: publishMsgCfg.MaxDealsPerMsg, - publishPeriod: publishMsgCfg.Period, - publishSpec: publishSpec, + api: dpapi, + as: as, + ctx: ctx, + Shutdown: cancel, + maxDealsPerPublishMsg: publishMsgCfg.MaxDealsPerMsg, + publishPeriod: publishMsgCfg.Period, + startEpochSealingBuffer: abi.ChainEpoch(publishMsgCfg.StartEpochSealingBuffer), + publishSpec: publishSpec, } } @@ -329,7 +333,7 @@ func (p *DealPublisher) validateDeal(deal market2.ClientDealProposal) error { if err != nil { return err } - if head.Height() > deal.Proposal.StartEpoch { + if head.Height()+p.startEpochSealingBuffer > deal.Proposal.StartEpoch { return xerrors.Errorf( "cannot publish deal with piece CID %s: current epoch %d has passed deal proposal start epoch %d", deal.Proposal.PieceCID, head.Height(), deal.Proposal.StartEpoch) diff --git a/node/builder_miner.go b/node/builder_miner.go index bd0784da254..ae0a61875c7 100644 --- a/node/builder_miner.go +++ b/node/builder_miner.go @@ -199,8 +199,9 @@ func ConfigStorageMiner(c interface{}) Option { Override(new(dtypes.RetrievalDealFilter), modules.RetrievalDealFilter(dealfilter.CliRetrievalDealFilter(cfg.Dealmaking.RetrievalFilter))), ), Override(new(*storageadapter.DealPublisher), storageadapter.NewDealPublisher(&cfg.Fees, storageadapter.PublishMsgConfig{ - Period: time.Duration(cfg.Dealmaking.PublishMsgPeriod), - MaxDealsPerMsg: cfg.Dealmaking.MaxDealsPerPublishMsg, + Period: time.Duration(cfg.Dealmaking.PublishMsgPeriod), + MaxDealsPerMsg: cfg.Dealmaking.MaxDealsPerPublishMsg, + StartEpochSealingBuffer: cfg.Dealmaking.StartEpochSealingBuffer, })), Override(new(storagemarket.StorageProviderNode), storageadapter.NewProviderNodeAdapter(&cfg.Fees, &cfg.Dealmaking)), ), diff --git a/node/config/def.go b/node/config/def.go index a1a4856a907..20444346aa4 100644 --- a/node/config/def.go +++ b/node/config/def.go @@ -148,6 +148,8 @@ func DefaultStorageMiner() *StorageMiner { SimultaneousTransfers: DefaultSimultaneousTransfers, + StartEpochSealingBuffer: 480, // 480 epochs buffer == 4 hours from adding deal to sector to sector being sealed + RetrievalPricing: &RetrievalPricing{ Strategy: RetrievalPricingDefaultMode, Default: &RetrievalPricingDefault{ diff --git a/node/config/doc_gen.go b/node/config/doc_gen.go index adb3b9485f9..c8ac3f28f73 100644 --- a/node/config/doc_gen.go +++ b/node/config/doc_gen.go @@ -265,6 +265,12 @@ passed to the sealing node by the markets service. 0 is unlimited.`, Comment: `The maximum number of parallel online data transfers (storage+retrieval)`, }, + { + Name: "StartEpochSealingBuffer", + Type: "uint64", + + Comment: `Minimum start epoch buffer to give time for sealing of sector with deal.`, + }, { Name: "Filter", Type: "string", diff --git a/node/config/types.go b/node/config/types.go index 8455665377c..aeaefd8cee5 100644 --- a/node/config/types.go +++ b/node/config/types.go @@ -131,6 +131,8 @@ type DealmakingConfig struct { MaxStagingDealsBytes int64 // The maximum number of parallel online data transfers (storage+retrieval) SimultaneousTransfers uint64 + // Minimum start epoch buffer to give time for sealing of sector with deal. + StartEpochSealingBuffer uint64 // A command used for fine-grained evaluation of storage deals // see https://docs.filecoin.io/mine/lotus/miner-configuration/#using-filters-for-fine-grained-storage-and-retrieval-deal-acceptance for more details diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go index 9e4ccc8d219..9e3bd95ab46 100644 --- a/node/modules/storageminer.go +++ b/node/modules/storageminer.go @@ -932,6 +932,8 @@ func ToSealingConfig(cfg *config.StorageMiner) sealiface.Config { TerminateBatchMax: cfg.Sealing.TerminateBatchMax, TerminateBatchMin: cfg.Sealing.TerminateBatchMin, TerminateBatchWait: time.Duration(cfg.Sealing.TerminateBatchWait), + + StartEpochSealingBuffer: abi.ChainEpoch(cfg.Dealmaking.StartEpochSealingBuffer), } }