curio: Plumb KeepUnsealed into the sealing pipeline

filecoin-project · Apr 27, 2024 · 506ad86 · 506ad86
1 parent 16e8ac8
commit 506ad86
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/curiosrc/market/deal_ingest.go b/curiosrc/market/deal_ingest.go
@@ -109,11 +109,14 @@ func (p *PieceIngester) AllocatePieceToSector(ctx context.Context, maddr address
                                         f05_deal_id,
                                         f05_deal_proposal,
                                         f05_deal_start_epoch,
-                                        f05_deal_end_epoch) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)`,
+                                        f05_deal_end_epoch,
+                                        
+                                        requested_keep_data) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)`,
 			mid, n, 0,
 			piece.DealProposal.PieceCID, piece.DealProposal.PieceSize,
 			source.String(), dataHdrJson, rawSize, !piece.KeepUnsealed,
-			piece.PublishCid, piece.DealID, dealProposalJson, piece.DealSchedule.StartEpoch, piece.DealSchedule.EndEpoch)
+			piece.PublishCid, piece.DealID, dealProposalJson,
+			piece.DealSchedule.StartEpoch, piece.DealSchedule.EndEpoch, piece.KeepUnsealed)
 		if err != nil {
 			return false, xerrors.Errorf("inserting into sectors_sdr_initial_pieces: %w", err)
 		}

diff --git a/curiosrc/seal/task_submit_commit.go b/curiosrc/seal/task_submit_commit.go
@@ -152,7 +152,7 @@ func (s *SubmitCommitTask) Do(taskID harmonytask.TaskID, stillOwned func() bool)
 	}
 
 	if err := s.transferFinalizedSectorData(ctx, sectorParams.SpID, sectorParams.SectorNumber); err != nil {
-		return false, xerrors.Errorf("transfering finalized sector data: %w", err)
+		return false, xerrors.Errorf("transferring finalized sector data: %w", err)
 	}
 
 	return true, nil
@@ -230,7 +230,7 @@ func (s *SubmitCommitTask) transferFinalizedSectorData(ctx context.Context, spID
             piece_index AS piece_num,
             piece_cid,
             piece_size,
-            TRUE AS requested_keep_data,
+            requested_keep_data,
             data_raw_size,
             COALESCE(f05_deal_start_epoch, direct_start_epoch) as start_epoch,
             COALESCE(f05_deal_end_epoch, direct_end_epoch) as orig_end_epoch,

diff --git a/lib/harmony/harmonydb/sql/20231217-sdr-pipeline.sql b/lib/harmony/harmonydb/sql/20231217-sdr-pipeline.sql
@@ -121,7 +121,8 @@ create table sectors_sdr_initial_pieces (
     -- direct_end_epoch bigint,
     -- direct_piece_activation_manifest jsonb,
 
-    -- TODO keep_unsealed
+    -- added in 20240425-sector_metadata.sql
+    -- requested_keep_data bool
 
     -- foreign key
     foreign key (sp_id, sector_number) references sectors_sdr_pipeline (sp_id, sector_number) on delete cascade,

diff --git a/lib/harmony/harmonydb/sql/20240425-sector_meta.sql b/lib/harmony/harmonydb/sql/20240425-sector_meta.sql
@@ -42,3 +42,5 @@ CREATE TABLE sectors_meta_pieces (
     PRIMARY KEY (sp_id, sector_num, piece_num),
     FOREIGN KEY (sp_id, sector_num) REFERENCES sectors_meta(sp_id, sector_num) ON DELETE CASCADE
 );
+
+ALTER TABLE sectors_sdr_initial_pieces ADD COLUMN requested_keep_data BOOL NOT NULL DEFAULT FALSE;