Skip to content

azure: use ResumingReader #155287

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

Merged
merged 1 commit into from
Oct 14, 2025
Merged

azure: use ResumingReader #155287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 33 additions & 17 deletions pkg/cloud/azure/azure_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,31 +356,47 @@ func isNotFoundErr(err error) bool {
func (s *azureStorage) ReadFile(
ctx context.Context, basename string, opts cloud.ReadOptions,
) (_ ioctx.ReadCloserCtx, fileSize int64, _ error) {
object := path.Join(s.prefix, basename)

ctx, sp := tracing.ChildSpan(ctx, "azure.ReadFile")
defer sp.Finish()
sp.SetTag("path", attribute.StringValue(path.Join(s.prefix, basename)))
resp, err := s.getBlob(basename).DownloadStream(ctx, &azblob.DownloadStreamOptions{Range: azblob.
HTTPRange{Offset: opts.Offset}})
if err != nil {
if isNotFoundErr(err) {
return nil, 0, cloud.WrapErrFileDoesNotExist(err, "azure blob does not exist")
}
return nil, 0, errors.Wrapf(err, "failed to create azure reader")
}
sp.SetTag("path", attribute.StringValue(object))

if !opts.NoFileSize {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wonder why you removed the NoFileSize logic here.

if opts.Offset == 0 {
fileSize = *resp.ContentLength
} else {
fileSize, err = cloud.CheckHTTPContentRangeHeader(*resp.ContentRange, opts.Offset)
r := cloud.NewResumingReader(ctx,
func(ctx context.Context, pos int64) (io.ReadCloser, int64, error) {
resp, err := s.getBlob(basename).DownloadStream(ctx, &azblob.DownloadStreamOptions{
Range: azblob.HTTPRange{Offset: pos},
})
if err != nil {
return nil, 0, err
}

length := *resp.ContentLength
if 0 < pos {
length, err = cloud.CheckHTTPContentRangeHeader(*resp.ContentRange, pos)
if err != nil {
return nil, 0, err
}
}

return resp.Body, length, nil
},
nil, // reader
opts.Offset,
0,
object,
cloud.ResumingReaderRetryOnErrFnForSettings(ctx, s.settings),
nil, // errFn
)

if err := r.Open(ctx); err != nil {
if isNotFoundErr(err) {
return nil, 0, cloud.WrapErrFileDoesNotExist(err, "azure blob does not exist")
}
return nil, 0, err
}
// BUG: we should follow the azure retry setting here.
reader := resp.NewRetryReader(ctx, &azblob.RetryReaderOptions{MaxRetries: 3})
return ioctx.ReadCloserAdapter(reader), fileSize, nil

return r, r.Size, nil
}

func (s *azureStorage) List(ctx context.Context, prefix, delim string, fn cloud.ListingFn) error {
Expand Down