Skip to content

Commit 294e91f

Browse files
committed
objstorageprovider: propagate errIsNotExist fn in remoteReadable
Fixes: cockroachdb/cockroach#154032
1 parent 45c093e commit 294e91f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

metamorphic/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func openExternalObj(
264264
opts := t.opts.MakeReaderOptions()
265265
reader, err = sstable.NewReader(
266266
context.Background(),
267-
objstorageprovider.NewRemoteReadable(objReader, objSize),
267+
objstorageprovider.NewRemoteReadable(objReader, objSize, t.externalStorage.IsNotExistError),
268268
opts,
269269
)
270270
if err != nil {

objstorage/objstorageprovider/remote_readable.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ import (
1616
)
1717

1818
// NewRemoteReadable creates an objstorage.Readable out of a remote.ObjectReader.
19-
func NewRemoteReadable(objReader remote.ObjectReader, size int64) objstorage.Readable {
19+
func NewRemoteReadable(
20+
objReader remote.ObjectReader, size int64, errIsNotExist func(error) bool,
21+
) objstorage.Readable {
2022
return &remoteReadable{
21-
objReader: objReader,
22-
size: size,
23+
objReader: objReader,
24+
size: size,
25+
errIsNotExist: errIsNotExist,
2326
}
2427
}
2528

tool/db_analyze_data.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func (r *remoteStorage) Open(name string) (objstorage.Readable, error) {
259259
if err != nil {
260260
return nil, err
261261
}
262-
return objstorageprovider.NewRemoteReadable(objReader, size), nil
262+
return objstorageprovider.NewRemoteReadable(objReader, size, r.storage.IsNotExistError), nil
263263
}
264264

265265
// We avoid files that are very large to prevent excessive memory usage. Note

0 commit comments

Comments
 (0)