extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-24 07:10:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

azureblob: factor readMetaData into readMetaDataAlways returning blob properties

Browse Source
This commit is contained in:
Nick Craig-Wood 2024-12-21 11:46:33 +00:00
parent 9dff45563d
commit 7fd7fe3c82
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
backend/azureblob/azureblob.go
View File

@ -1897,24 +1897,46 @@ func (o *Object) clearMetaData() {
} }
// readMetaData gets the metadata if it hasn't already been fetched // readMetaData gets the metadata if it hasn't already been fetched
func (f *Fs) readMetaData(ctx context.Context, container, containerPath string) (blobProperties blob.GetPropertiesResponse, err error) { func (f *Fs) readMetaData(ctx context.Context, container, containerPath string) (blobProperties *blob.GetPropertiesResponse, err error) {
if !f.containerOK(container) { if !f.containerOK(container) {
return blobProperties, fs.ErrorObjectNotFound return nil, fs.ErrorObjectNotFound
} }
blb := f.getBlobSVC(container, containerPath) blb := f.getBlobSVC(container, containerPath)
// Read metadata (this includes metadata) // Read metadata (this includes metadata)
options := blob.GetPropertiesOptions{} options := blob.GetPropertiesOptions{}
var resp blob.GetPropertiesResponse
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
blobProperties, err = blb.GetProperties(ctx, &options) resp, err = blb.GetProperties(ctx, &options)
return f.shouldRetry(ctx, err) return f.shouldRetry(ctx, err)
}) })
if err != nil { if err != nil {
// On directories - GetProperties does not work and current SDK does not populate service code correctly hence check regular http response as well // On directories - GetProperties does not work and current SDK does not populate service code correctly hence check regular http response as well
if storageErr, ok := err.(*azcore.ResponseError); ok && (storageErr.ErrorCode == string(bloberror.BlobNotFound) || storageErr.StatusCode == http.StatusNotFound) { if storageErr, ok := err.(*azcore.ResponseError); ok && (storageErr.ErrorCode == string(bloberror.BlobNotFound) || storageErr.StatusCode == http.StatusNotFound) {
return blobProperties, fs.ErrorObjectNotFound return nil, fs.ErrorObjectNotFound
} }
return blobProperties, err return nil, err
}
return &resp, nil
}
// readMetaDataAlways gets the metadata unconditionally and also the blob properties.
//
// Sets
//
// o.id
// o.modTime
// o.size
// o.md5
func (o *Object) readMetaDataAlways(ctx context.Context) (blobProperties *blob.GetPropertiesResponse, err error) {
container, containerPath := o.split()
blobProperties, err = o.fs.readMetaData(ctx, container, containerPath)
if err != nil {
return nil, err
}
err = o.decodeMetaDataFromPropertiesResponse(blobProperties)
if err != nil {
return nil, err
} }
return blobProperties, nil return blobProperties, nil
} }
@ -1931,12 +1953,8 @@ func (o *Object) readMetaData(ctx context.Context) (err error) {
if !o.modTime.IsZero() { if !o.modTime.IsZero() {
return nil return nil
} }
container, containerPath := o.split() _, err = o.readMetaDataAlways(ctx)
blobProperties, err := o.fs.readMetaData(ctx, container, containerPath) return err
if err != nil {
return err
}
return o.decodeMetaDataFromPropertiesResponse(&blobProperties)
} }
// ModTime returns the modification time of the object // ModTime returns the modification time of the object