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

storagedriver/s3: More comment wording

Browse Source
This commit is contained in:
Collin Shoop 2021-06-30 08:42:52 -04:00
parent d257d6ce28
commit dec90d3b1a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
registry/storage/driver/s3-aws/s3.go
View File

@ -1104,13 +1104,13 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
ctx, done := dcontext.WithTrace(parentCtx) ctx, done := dcontext.WithTrace(parentCtx)
defer done("s3aws.ListObjectsV2Pages(%s)", path) defer done("s3aws.ListObjectsV2Pages(%s)", path)
// The s3 list object API will list all objects under the starting path recursively, in sorted, // When the "delimiter" argument is omitted, the S3 list API will list all objects in the bucket
// depth-first ordering https://docs.aws.amazon.com/AmazonS3/latest/userguide/ListingKeysUsingAPIs.html // recursively, omitting directory paths. Objects are listed in sorted, depth-first order so we
// S3 does not return directory without the "delimiter":"/" argument passed, but they can to be // can infer all the directories by comparing each object path to the last one we saw.
// inferred from object paths and then de-duplicated to avoid calling the walk fn redundantly. // See: https://docs.aws.amazon.com/AmazonS3/latest/userguide/ListingKeysUsingAPIs.html
// With files returned in sorted depth-first order, directories are inferred in the same order,
// so avoiding redundant directories is a matter of not passing the same directory to the walk fn twice in a row. // With files returned in sorted depth-first order, directories are inferred in the same order.
// ErrSkipDir is handled by explicitly skipping over any files under the skipped directory. This may sub-optimal // ErrSkipDir is handled by explicitly skipping over any files under the skipped directory. This may be sub-optimal
// for extreme edge cases but for the general use case in a registry, this is orders of magnitude // for extreme edge cases but for the general use case in a registry, this is orders of magnitude
// faster than a more explicit recursive implementation. // faster than a more explicit recursive implementation.
listObjectErr := s.ListObjectsV2PagesWithContext(ctx, listObjectsInput, func(objects *s3.ListObjectsV2Output, lastPage bool) bool { listObjectErr := s.ListObjectsV2PagesWithContext(ctx, listObjectsInput, func(objects *s3.ListObjectsV2Output, lastPage bool) bool {
@ -1119,7 +1119,7 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
for _, file := range objects.Contents { for _, file := range objects.Contents {
filePath := strings.Replace(*file.Key, d.s3Path(""), prefix, 1) filePath := strings.Replace(*file.Key, d.s3Path(""), prefix, 1)
// get a list of all inferred directories skipped between the previous directory and this file // get a list of all inferred directories between the previous directory and this file
dirs := directoryDiff(prevDir, filePath) dirs := directoryDiff(prevDir, filePath)
if len(dirs) > 0 { if len(dirs) > 0 {
for _, dir := range dirs { for _, dir := range dirs {