diff --git a/fr32/readers_test.go b/fr32/readers_test.go index 83ef14353..f0f1e21bc 100644 --- a/fr32/readers_test.go +++ b/fr32/readers_test.go @@ -12,27 +12,6 @@ import ( "github.com/filecoin-project/sector-storage/fr32" ) -func TestPadReader(t *testing.T) { - ps := abi.PaddedPieceSize(64 << 20).Unpadded() - - raw := bytes.Repeat([]byte{0x55}, int(ps)) - - r, err := fr32.NewPadReader(bytes.NewReader(raw), ps) - if err != nil { - t.Fatal(err) - } - - readerPadded, err := ioutil.ReadAll(r) - if err != nil { - t.Fatal(err) - } - - padOut := make([]byte, ps.Padded()) - fr32.Pad(raw, padOut) - - require.Equal(t, padOut, readerPadded) -} - func TestUnpadReader(t *testing.T) { ps := abi.PaddedPieceSize(64 << 20).Unpadded() diff --git a/roprov.go b/roprov.go index 7a288bb39..c7baede82 100644 --- a/roprov.go +++ b/roprov.go @@ -26,9 +26,11 @@ func (l *readonlyProvider) AcquireSector(ctx context.Context, id abi.SectorID, e // use TryLock to avoid blocking locked, err := l.index.StorageTryLock(ctx, id, existing, stores.FTNone) if err != nil { + cancel() return stores.SectorPaths{}, nil, xerrors.Errorf("acquiring sector lock: %w", err) } if !locked { + cancel() return stores.SectorPaths{}, nil, xerrors.Errorf("failed to acquire sector lock") }