Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

storage manager: bail out with an error if unsealed cid is undefined (redux) #3655

Merged
merged 3 commits into from
Sep 8, 2020
Merged

storage manager: bail out with an error if unsealed cid is undefined (redux) #3655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bbdf2e
fix: storage manager - bail out on undefined unsealed cid
dirkmc Sep 8, 2020
17c15a7
fix: return true from Sealer.ReadPiece() on success
dirkmc Sep 8, 2020
e87ccbf
Merge pull request #3657 from filecoin-project/fix/stg-sealer-read-piece
magik6k Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/sector-storage/ffiwrapper/sealer_cgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ func (sb *Sealer) ReadPiece(ctx context.Context, writer io.Writer, sector abi.Se
return false, xerrors.Errorf("closing partial file: %w", err)
}

return false, nil
return true, nil
}

func (sb *Sealer) SealPreCommit1(ctx context.Context, sector abi.SectorID, ticket abi.SealRandomness, pieces []abi.PieceInfo) (out storage.PreCommit1Out, err error) {
Expand Down
12 changes: 5 additions & 7 deletions extern/sector-storage/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,11 @@ func (m *Manager) ReadPiece(ctx context.Context, sink io.Writer, sector abi.Sect
return xerrors.Errorf("read piece: checking for already existing unsealed sector: %w", err)
}

var readOk bool
var selector WorkerSelector
if len(best) == 0 { // new
selector = newAllocSelector(m.index, stores.FTUnsealed, stores.PathSealing)
} else { // append to existing
selector = newExistingSelector(m.index, sector, stores.FTUnsealed, false)
}

var readOk bool

if len(best) > 0 {
// There is unsealed sector, see if we can read from it

selector = newExistingSelector(m.index, sector, stores.FTUnsealed, false)
Expand Down Expand Up @@ -257,6 +252,9 @@ func (m *Manager) ReadPiece(ctx context.Context, sink io.Writer, sector abi.Sect
return nil
}

if unsealed == cid.Undef {
return xerrors.Errorf("cannot unseal piece (sector: %d, offset: %d size: %d) - unsealed cid is undefined", sector, offset, size)
}
err = m.sched.Schedule(ctx, sector, sealtasks.TTUnseal, selector, unsealFetch, func(ctx context.Context, w Worker) error {
return w.UnsealPiece(ctx, sector, offset, size, ticket, unsealed)
})
Expand All @@ -274,7 +272,7 @@ func (m *Manager) ReadPiece(ctx context.Context, sink io.Writer, sector abi.Sect
return xerrors.Errorf("reading piece from sealed sector: %w", err)
}

if readOk {
if !readOk {
return xerrors.Errorf("failed to read unsealed piece")
}

Expand Down