Merge pull request #522 from ipfs-force-community/chore/outpu-payload…

…-size chore: output payload size to log
ipfs-force-community · Apr 22, 2024 · b4f4a84 · b4f4a84
2 parents 931a30d + be539a1
commit b4f4a84
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/storageprovider/deal_handler.go b/storageprovider/deal_handler.go
@@ -542,8 +542,9 @@ func (storageDealPorcess *StorageDealProcessImpl) HandleOff(ctx context.Context,
 				return storageDealPorcess.HandleError(ctx, deal, fmt.Errorf("fail to save deal to database: %v", err))
 			}
 		}
+		log.Infof("after publishing deal. piece cid: %s, payload size: %d", deal.Proposal.PieceCID, deal.PayloadSize)
 
-		log.Infof("register shard. deal:%d, proposalCid:%s, pieceCid:%s", deal.DealID, deal.ProposalCid, deal.Proposal.PieceCID)
+		log.Infof("register shard. deal: %d, proposalCid: %s, pieceCid: %s", deal.DealID, deal.ProposalCid, deal.Proposal.PieceCID)
 		// Register the deal data as a "shard" with the DAG store. Later it can be
 		// fetched from the DAG store during retrieval.
 		if err := storageDealPorcess.dagStore.RegisterShard(ctx, deal.Proposal.PieceCID, carFilePath, true, nil); err != nil {

diff --git a/storageprovider/direct_deal_provider.go b/storageprovider/direct_deal_provider.go
@@ -89,7 +89,7 @@ func (ddp *DirectDealProvider) ImportDeals(ctx context.Context, dealParams *type
 func (ddp *DirectDealProvider) importDeal(ctx context.Context, dealParam *types.DirectDealParam, cParams *commonParams) error {
 	deal, err := ddp.dealRepo.GetDealByAllocationID(ctx, dealParam.AllocationID)
 	if err == nil {
-		return fmt.Errorf("deal(%v) exist: %s", deal.ID, deal.State.String())
+		return fmt.Errorf("deal(%v) exist: %s", deal.AllocationID, deal.State.String())
 	}
 	if !errors.Is(err, repo.ErrNotFound) {
 		return err
@@ -116,6 +116,7 @@ func (ddp *DirectDealProvider) importDeal(ctx context.Context, dealParam *types.
 	if deal.PayloadSize == 0 {
 		return fmt.Errorf("payload size is 0")
 	}
+	directDealLog.Infof("deal piece cid: %s, allocation id: %d, payload size: %d", deal.PieceCID, deal.AllocationID, deal.PayloadSize)
 
 	if err := ddp.dealRepo.SaveDeal(ctx, deal); err != nil {
 		return err

diff --git a/storageprovider/storage_provider.go b/storageprovider/storage_provider.go
@@ -481,7 +481,7 @@ func (p *StorageProviderImpl) importDataForDeal(ctx context.Context, d *types.Mi
 	// "will fire VerifiedData for imported file
 	d.PiecePath = piecePath
 	d.MetadataPath = filestore.Path("")
-	log.Infof("deal %s piece path: %s", propCid, d.PiecePath)
+	log.Infof("deal %s piece path: %s, payload size: %v", propCid, d.PiecePath, carSize)
 
 	d.State = storagemarket.StorageDealReserveProviderFunds
 	d.PieceStatus = types.Undefine