Review Response

extern/sector-storage/ffiwrapper/sealer_cgo.go

@@ -252,7 +252,7 @@ func (sb *Sealer) pieceCid(spt abi.RegisteredSealProof, in []byte) (cid.Cid, err
 }
 
 func (sb *Sealer) tryDecodeUpdatedReplica(ctx context.Context, sector storage.SectorRef, commD cid.Cid, unsealedPath string) (bool, error) {
-	updatePath, done, err := sb.sectors.AcquireSector(ctx, sector, storiface.FTUpdate, storiface.FTNone, storiface.PathStorage)
+	paths, done, err := sb.sectors.AcquireSector(ctx, sector, storiface.FTUpdate|storiface.FTSealed|storiface.FTCache, storiface.FTNone, storiface.PathStorage)
 	if xerrors.Is(err, storiface.ErrSectorNotFound) {
 		return false, nil
 	} else if err != nil {
@@ -261,18 +261,11 @@ func (sb *Sealer) tryDecodeUpdatedReplica(ctx context.Context, sector storage.Se
 	defer done()
 
 	// Sector data stored in replica update
-	sealedPaths, done, err := sb.sectors.AcquireSector(ctx, sector, storiface.FTSealed|storiface.FTCache, storiface.FTNone, storiface.PathStorage)
-	defer done()
-	if xerrors.Is(err, storiface.ErrSectorNotFound) {
-		return false, xerrors.Errorf("sector key does not exist for updated replica, but decoding replica requires existing sector key: %w", err)
-	} else if err != nil {
-		return false, xerrors.Errorf("reading sector key of replica: %w", err)
-	}
 	updateProof, err := sector.ProofType.RegisteredUpdateProof()
 	if err != nil {
 		return false, err
 	}
-	return true, ffi.SectorUpdate.DecodeFrom(updateProof, unsealedPath, updatePath.Update, sealedPaths.Sealed, sealedPaths.Cache, commD)
+	return true, ffi.SectorUpdate.DecodeFrom(updateProof, unsealedPath, paths.Update, paths.Sealed, paths.Cache, commD)
 }
 
 func (sb *Sealer) UnsealPiece(ctx context.Context, sector storage.SectorRef, offset storiface.UnpaddedByteIndex, size abi.UnpaddedPieceSize, randomness abi.SealRandomness, commd cid.Cid) error {

extern/sector-storage/manager_test.go

@@ -246,14 +246,6 @@ func TestSnapDeals(t *testing.T) {
 	require.NoError(t, err)
 	fmt.Printf("PC2\n")
 	pc2Out, err := m.SealPreCommit2(ctx, sid, pc1Out)
-
-	require.NoError(t, err)
-	seed := abi.InteractiveSealRandomness{1, 1, 1, 1, 1, 1, 1}
-	fmt.Printf("C1\n")
-	c1Out, err := m.SealCommit1(ctx, sid, ticket, seed, nil, pc2Out)
-	require.NoError(t, err)
-	fmt.Printf("C2\n")
-	_, err = m.SealCommit2(ctx, sid, c1Out)
 	require.NoError(t, err)
 
 	// Now do a snap deals replica update
@@ -271,20 +263,26 @@ func TestSnapDeals(t *testing.T) {
 
 	pieces := []abi.PieceInfo{p1, p2}
 	fmt.Printf("RU\n")
+	startRU := time.Now()
 	out, err := m.ReplicaUpdate(ctx, sid, pieces)
 	require.NoError(t, err)
+	fmt.Printf("RU duration (%s): %s\n", ss.ShortString(), time.Since(startRU))
 
 	updateProofType, err := sid.ProofType.RegisteredUpdateProof()
 	require.NoError(t, err)
 	require.NotNil(t, out)
 	fmt.Printf("PR1\n")
+	startPR1 := time.Now()
 	vanillaProofs, err := m.ProveReplicaUpdate1(ctx, sid, sectorKey, out.NewSealed, out.NewUnsealed)
 	require.NoError(t, err)
 	require.NotNil(t, vanillaProofs)
+	fmt.Printf("PR1 duration (%s): %s\n", ss.ShortString(), time.Since(startPR1))
 	fmt.Printf("PR2\n")
+	startPR2 := time.Now()
 	proof, err := m.ProveReplicaUpdate2(ctx, sid, sectorKey, out.NewSealed, out.NewUnsealed, vanillaProofs)
 	require.NoError(t, err)
 	require.NotNil(t, proof)
+	fmt.Printf("PR2 duration (%s): %s\n", ss.ShortString(), time.Since(startPR2))
 
 	vInfo := proof7.ReplicaUpdateInfo{
 		Proof:                proof,
@@ -300,15 +298,20 @@ func TestSnapDeals(t *testing.T) {
 	fmt.Printf("Decode\n")
 	// Remove unsealed data and decode for retrieval
 	require.NoError(t, m.FinalizeSector(ctx, sid, nil))
+	startDecode := time.Now()
 	require.NoError(t, m.SectorsUnsealPiece(ctx, sid, 0, p1.Size.Unpadded(), ticket, &out.NewUnsealed))
+	fmt.Printf("Decode duration (%s): %s\n", ss.ShortString(), time.Since(startDecode))
 
 	// Remove just the first piece and decode for retrieval
 	require.NoError(t, m.FinalizeSector(ctx, sid, []storage.Range{{Offset: p1.Size.Unpadded(), Size: p2.Size.Unpadded()}}))
 	require.NoError(t, m.SectorsUnsealPiece(ctx, sid, 0, p1.Size.Unpadded(), ticket, &out.NewUnsealed))
 
 	fmt.Printf("GSK\n")
 	require.NoError(t, m.ReleaseSectorKey(ctx, sid))
+	startGSK := time.Now()
 	require.NoError(t, m.GenerateSectorKeyFromData(ctx, sid, out.NewUnsealed))
+	fmt.Printf("GSK duration (%s): %s\n", ss.ShortString(), time.Since(startGSK))
+
 }
 
 func TestRedoPC1(t *testing.T) {