github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-19 23:38:13 +00:00
Code Issues Projects Releases Wiki Activity

Return a sensible error in races between blob upload completions

Browse Source 
Completing a blob upload is a multi-step process, especially on a storage
backend like S3 which lacks a "move" primitive. If a client times out (or
disconnects) during a commit, then retries immediately, we'll end up invoking
the "resume" logic for the blob upload while the completion from the previous
request is still in progress. The resume tries to find the upload's data, but
the commit has already moved it to its new location, resulting in a PathNotFound
error from the storage driver.

Previously, this error was passed back to the HTTP handler and translated into a
500 Internal Server Error. Return ErrBlobUploadUnknown instead, so that the HTTP
handler will return a 404.
This commit is contained in:
Adam Wolfe Gordon 2020-08-24 13:49:09 -06:00
parent d9adf97319
commit 611f55e79a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
registry/storage/linkedblobstore.go
View File

@ -210,7 +210,17 @@ func (lbs *linkedBlobStore) Resume(ctx context.Context, id string) (distribution
return nil, err
}
return lbs.newBlobUpload(ctx, id, path, startedAt, true)
bw, err := lbs.newBlobUpload(ctx, id, path, startedAt, true)
if err != nil {
switch err := err.(type) {
case driver.PathNotFoundError:
return nil, distribution.ErrBlobUploadUnknown
default:
return nil, err
}
}
return bw, nil
}
func (lbs *linkedBlobStore) Delete(ctx context.Context, dgst digest.Digest) error {