Merge pull request #32 from filecoin-project/fix/pc1-fail-cleanup

Cleanup before retrying precommit1

go.sum

@@ -41,6 +41,7 @@ github.com/filecoin-project/go-paramfetch v0.0.1 h1:gV7bs5YaqlgpGFMiLxInGK2L1FyC
 github.com/filecoin-project/go-paramfetch v0.0.1/go.mod h1:fZzmf4tftbwf9S37XRifoJlz7nCjRdIrMGLR07dKLCc=
 github.com/filecoin-project/specs-actors v0.0.0-20200409043918-e569f4a2f504 h1:mwuAaqxKThl70+7FkGdFKVLdwaQZQ8XmscKdhSBBtnc=
 github.com/filecoin-project/specs-actors v0.0.0-20200409043918-e569f4a2f504/go.mod h1:mdJraXq5vMy0+/FqVQIrnNlpQ/Em6zeu06G/ltQ0/lA=
+github.com/filecoin-project/specs-actors v0.3.0/go.mod h1:nQYnFbQ7Y0bHZyq6HDEuVlCPR+U3z5Q3wMOQ+2aiV+Y=
 github.com/filecoin-project/specs-actors v0.4.1-0.20200508202406-42be6629284d h1:vzuhvR+huV95QU+KSBCyQvLP6LUtwrPUyeUTzOx1B5I=
 github.com/filecoin-project/specs-actors v0.4.1-0.20200508202406-42be6629284d/go.mod h1:UW3ft23q6VS8wQoNqLWjENsu9gu1uh6lxOd+H8cwhT8=
 github.com/filecoin-project/specs-storage v0.0.0-20200417134612-61b2d91a6102 h1:T3f/zkuvgtgqcXrb0NO3BicuveGOxxUAMPa/Yif2kuE=

localworker.go

@@ -114,6 +114,17 @@ func (l *LocalWorker) Fetch(ctx context.Context, sector abi.SectorID, fileType s
 }
 
 func (l *LocalWorker) SealPreCommit1(ctx context.Context, sector abi.SectorID, ticket abi.SealRandomness, pieces []abi.PieceInfo) (out storage2.PreCommit1Out, err error) {
+	{
+		// cleanup previous failed attempts if they exist
+		if err := l.storage.Remove(ctx, sector, stores.FTSealed, true); err != nil {
+			return nil, xerrors.Errorf("cleaning up sealed data: %w", err)
+		}
+
+		if err := l.storage.Remove(ctx, sector, stores.FTCache, true); err != nil {
+			return nil, xerrors.Errorf("cleaning up cache data: %w", err)
+		}
+	}
+
 	sb, err := l.sb()
 	if err != nil {
 		return nil, err
@@ -159,7 +170,7 @@ func (l *LocalWorker) FinalizeSector(ctx context.Context, sector abi.SectorID) e
 		return xerrors.Errorf("finalizing sector: %w", err)
 	}
 
-	if err := l.storage.Remove(ctx, sector, stores.FTUnsealed); err != nil {
+	if err := l.storage.Remove(ctx, sector, stores.FTUnsealed, true); err != nil {
 		return xerrors.Errorf("removing unsealed data: %w", err)
 	}
 

stores/http_handler.go

@@ -131,7 +131,7 @@ func (handler *FetchHandler) remoteDeleteSector(w http.ResponseWriter, r *http.R
 		return
 	}
 
-	if err := handler.Remove(r.Context(), id, ft); err != nil {
+	if err := handler.Remove(r.Context(), id, ft, false); err != nil {
 		log.Error("%+v", err)
 		w.WriteHeader(500)
 		return

stores/interface.go

@@ -11,7 +11,7 @@ import (
 
 type Store interface {
 	AcquireSector(ctx context.Context, s abi.SectorID, spt abi.RegisteredProof, existing SectorFileType, allocate SectorFileType, sealing bool) (paths SectorPaths, stores SectorPaths, done func(), err error)
-	Remove(ctx context.Context, s abi.SectorID, types SectorFileType) error
+	Remove(ctx context.Context, s abi.SectorID, types SectorFileType, force bool) error
 
 	// move sectors into storage
 	MoveStorage(ctx context.Context, s abi.SectorID, spt abi.RegisteredProof, types SectorFileType) error

stores/local.go

@@ -313,7 +313,7 @@ func (st *Local) Local(ctx context.Context) ([]StoragePath, error) {
 	return out, nil
 }
 
-func (st *Local) Remove(ctx context.Context, sid abi.SectorID, typ SectorFileType) error {
+func (st *Local) Remove(ctx context.Context, sid abi.SectorID, typ SectorFileType, force bool) error {
 	if bits.OnesCount(uint(typ)) != 1 {
 		return xerrors.New("delete expects one file type")
 	}
@@ -323,7 +323,7 @@ func (st *Local) Remove(ctx context.Context, sid abi.SectorID, typ SectorFileTyp
 		return xerrors.Errorf("finding existing sector %d(t:%d) failed: %w", sid, typ, err)
 	}
 
-	if len(si) == 0 {
+	if len(si) == 0 && !force {
 		return xerrors.Errorf("can't delete sector %v(%d), not found", sid, typ)
 	}
 

stores/remote.go

@@ -214,12 +214,12 @@ func (r *Remote) MoveStorage(ctx context.Context, s abi.SectorID, spt abi.Regist
 	return r.local.MoveStorage(ctx, s, spt, types)
 }
 
-func (r *Remote) Remove(ctx context.Context, sid abi.SectorID, typ SectorFileType) error {
+func (r *Remote) Remove(ctx context.Context, sid abi.SectorID, typ SectorFileType, force bool) error {
 	if bits.OnesCount(uint(typ)) != 1 {
 		return xerrors.New("delete expects one file type")
 	}
 
-	if err := r.local.Remove(ctx, sid, typ); err != nil {
+	if err := r.local.Remove(ctx, sid, typ, force); err != nil {
 		return xerrors.Errorf("remove from local: %w", err)
 	}