Skip to content
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

vendor: bump github.com/Azure/azure-sdk-for-go deps #5709

Closed
wants to merge 2 commits into from
Closed

vendor: bump github.com/Azure/azure-sdk-for-go deps #5709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b3a9fd
vendor: bump github.com/Azure/azure-sdk-for-go deps
crazy-max Feb 29, 2024
1d6065a
dockerfile: update azurite to 3.33.0
crazy-max Feb 29, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG DNSNAME_VERSION=v1.3.1
ARG NYDUS_VERSION=v2.2.4
ARG MINIO_VERSION=RELEASE.2022-05-03T20-36-08Z
ARG MINIO_MC_VERSION=RELEASE.2022-05-04T06-07-55Z
ARG AZURITE_VERSION=3.18.0
ARG AZURITE_VERSION=3.33.0
ARG GOTESTSUM_VERSION=v1.9.0
ARG DELVE_VERSION=v1.23.1

Expand Down
62 changes: 23 additions & 39 deletions cache/remotecache/azblob/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import (
"io"
"time"

"github.com/Azure/azure-sdk-for-go/sdk/azcore"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
Expand All @@ -30,7 +32,7 @@ func ResolveCacheExporterFunc() remotecache.ResolveCacheExporterFunc {
return nil, errors.WithMessage(err, "failed to create azblob config")
}

containerClient, err := createContainerClient(ctx, config)
client, err := newClient(ctx, config)
if err != nil {
return nil, errors.WithMessage(err, "failed to create container client")
}
Expand All @@ -39,7 +41,7 @@ func ResolveCacheExporterFunc() remotecache.ResolveCacheExporterFunc {
return &exporter{
CacheExporterTarget: cc,
chains: cc,
containerClient: containerClient,
client: client,
config: config,
}, nil
}
Expand All @@ -49,9 +51,9 @@ var _ remotecache.Exporter = &exporter{}

type exporter struct {
solver.CacheExporterTarget
chains *v1.CacheChains
containerClient *azblob.ContainerClient
config *Config
chains *v1.CacheChains
client *Client
config *Config
}

func (ce *exporter) Name() string {
Expand Down Expand Up @@ -83,9 +85,9 @@ func (ce *exporter) Finalize(ctx context.Context) (map[string]string, error) {
}
diffID = dgst

key := blobKey(ce.config, dgstPair.Descriptor.Digest.String())
key := ce.client.blobKey(dgstPair.Descriptor.Digest.String())

exists, err := blobExists(ctx, ce.containerClient, key)
exists, err := ce.client.blobExists(ctx, key)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -126,7 +128,7 @@ func (ce *exporter) Finalize(ctx context.Context) (map[string]string, error) {
}

for _, name := range ce.config.Names {
if innerError := ce.uploadManifest(ctx, manifestKey(ce.config, name), bytesToReadSeekCloser(dt)); innerError != nil {
if innerError := ce.uploadManifest(ctx, ce.client.manifestKey(name), bytesToReadSeekCloser(dt)); innerError != nil {
return nil, errors.Wrapf(innerError, "error writing manifest %s", name)
}
}
Expand All @@ -140,22 +142,17 @@ func (ce *exporter) Config() remotecache.Config {
}
}

// For uploading manifests, use the Upload API which follows "last writer wins" sematics
// For uploading manifests, use the Upload API which follows "last writer wins" semantics
// This is slightly slower than UploadStream call but is safe to call concurrently from multiple threads. Refer to:
// https://github.com/Azure/azure-sdk-for-go/issues/18490#issuecomment-1170806877
func (ce *exporter) uploadManifest(ctx context.Context, manifestKey string, reader io.ReadSeekCloser) error {
defer reader.Close()
blobClient, err := ce.containerClient.NewBlockBlobClient(manifestKey)
if err != nil {
return errors.Wrap(err, "error creating container client")
}

ctx, cnclFn := context.WithCancelCause(ctx)
ctx, _ = context.WithTimeoutCause(ctx, time.Minute*5, errors.WithStack(context.DeadlineExceeded))
defer cnclFn(errors.WithStack(context.Canceled))

_, err = blobClient.Upload(ctx, reader, &azblob.BlockBlobUploadOptions{})
if err != nil {
if _, err := ce.client.UploadStream(ctx, ce.config.Container, manifestKey, reader, nil); err != nil {
return errors.Wrapf(err, "failed to upload blob %s: %v", manifestKey, err)
}

Expand All @@ -166,37 +163,24 @@ func (ce *exporter) uploadManifest(ctx context.Context, manifestKey string, read
// does not already exist. Since blobs are content addressable, this is the right thing to do for blobs and it gives
// a performance improvement over the Upload API used for uploading manifests.
func (ce *exporter) uploadBlobIfNotExists(ctx context.Context, blobKey string, reader io.Reader) error {
blobClient, err := ce.containerClient.NewBlockBlobClient(blobKey)
if err != nil {
return errors.Wrap(err, "error creating container client")
}

uploadCtx, cnclFn := context.WithCancelCause(ctx)
uploadCtx, _ = context.WithTimeoutCause(uploadCtx, time.Minute*5, errors.WithStack(context.DeadlineExceeded))
ctx, cnclFn := context.WithCancelCause(ctx)
ctx, _ = context.WithTimeoutCause(ctx, time.Minute*5, errors.WithStack(context.DeadlineExceeded))
defer cnclFn(errors.WithStack(context.Canceled))

// Only upload if the blob doesn't exist
eTagAny := azblob.ETagAny
_, err = blobClient.UploadStream(uploadCtx, reader, azblob.UploadStreamOptions{
BufferSize: IOChunkSize,
MaxBuffers: IOConcurrency,
BlobAccessConditions: &azblob.BlobAccessConditions{
ModifiedAccessConditions: &azblob.ModifiedAccessConditions{
eTagAny := azcore.ETagAny
if _, err := ce.client.UploadStream(ctx, ce.config.Container, blobKey, reader, &azblob.UploadStreamOptions{
BlockSize: IOChunkSize,
Concurrency: IOConcurrency,
AccessConditions: &azblob.AccessConditions{
ModifiedAccessConditions: &blob.ModifiedAccessConditions{
IfNoneMatch: &eTagAny,
},
},
})

if err == nil {
return nil
}); err != nil {
return errors.Wrapf(err, "failed to upload blob %s: %v", blobKey, err)
}

var se *azblob.StorageError
if errors.As(err, &se) && se.ErrorCode == azblob.StorageErrorCodeBlobAlreadyExists {
return nil
}

return errors.Wrapf(err, "failed to upload blob %s: %v", blobKey, err)
return nil
}

var _ io.ReadSeekCloser = &readSeekCloser{}
Expand Down
73 changes: 28 additions & 45 deletions cache/remotecache/azblob/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"io"
"sync"

"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
Expand All @@ -32,25 +31,23 @@ func ResolveCacheImporterFunc() remotecache.ResolveCacheImporterFunc {
return nil, ocispecs.Descriptor{}, errors.WithMessage(err, "failed to create azblob config")
}

containerClient, err := createContainerClient(ctx, config)
client, err := newClient(ctx, config)
if err != nil {
return nil, ocispecs.Descriptor{}, errors.WithMessage(err, "failed to create container client")
}

importer := &importer{
config: config,
containerClient: containerClient,
}

return importer, ocispecs.Descriptor{}, nil
return &importer{
config: config,
client: client,
}, ocispecs.Descriptor{}, nil
}
}

var _ remotecache.Importer = &importer{}

type importer struct {
config *Config
containerClient *azblob.ContainerClient
config *Config
client *Client
}

func (ci *importer) Resolve(ctx context.Context, _ ocispecs.Descriptor, id string, w worker.Worker) (solver.CacheManager, error) {
Expand Down Expand Up @@ -88,29 +85,23 @@ func (ci *importer) Resolve(ctx context.Context, _ ocispecs.Descriptor, id strin
}

func (ci *importer) loadManifest(ctx context.Context, name string) (*v1.CacheChains, error) {
key := manifestKey(ci.config, name)
exists, err := blobExists(ctx, ci.containerClient, key)
key := ci.client.manifestKey(name)
exists, err := ci.client.blobExists(ctx, key)
if err != nil {
return nil, err
}

bklog.G(ctx).Debugf("name %s cache with key %s exists = %v", name, key, exists)

if !exists {
return v1.NewCacheChains(), nil
}

blobClient, err := ci.containerClient.NewBlockBlobClient(key)
if err != nil {
return nil, errors.Wrap(err, "error creating container client")
}

res, err := blobClient.Download(ctx, &azblob.BlobDownloadOptions{})
res, err := ci.client.DownloadStream(ctx, ci.config.Container, name, nil)
if err != nil {
return nil, errors.WithStack(err)
return nil, errors.Wrapf(err, "failed to download cache manifest %s", name)
}

bytes, err := io.ReadAll(res.RawResponse.Body)
bytes, err := io.ReadAll(res.Body)
if err != nil {
return nil, errors.WithStack(err)
}
Expand Down Expand Up @@ -164,10 +155,9 @@ func (ci *importer) makeDescriptorProviderPair(l v1.CacheLayer) (*v1.DescriptorP
Annotations: annotations,
}
p := &ciProvider{
desc: desc,
containerClient: ci.containerClient,
Provider: contentutil.FromFetcher(&fetcher{containerClient: ci.containerClient, config: ci.config}),
config: ci.config,
desc: desc,
client: ci.client,
Provider: contentutil.FromFetcher(&fetcher{client: ci.client, config: ci.config}),
}
return &v1.DescriptorProviderPair{
Descriptor: desc,
Expand All @@ -177,43 +167,36 @@ func (ci *importer) makeDescriptorProviderPair(l v1.CacheLayer) (*v1.DescriptorP
}

type fetcher struct {
containerClient *azblob.ContainerClient
config *Config
client *Client
config *Config
}

func (f *fetcher) Fetch(ctx context.Context, desc ocispecs.Descriptor) (io.ReadCloser, error) {
key := blobKey(f.config, desc.Digest.String())
exists, err := blobExists(ctx, f.containerClient, key)
key := f.client.blobKey(desc.Digest.String())
exists, err := f.client.blobExists(ctx, key)
if err != nil {
return nil, err
}

if !exists {
return nil, errors.Errorf("blob %s not found", desc.Digest)
}

bklog.G(ctx).Debugf("reading layer from cache: %s", key)

blobClient, err := f.containerClient.NewBlockBlobClient(key)
if err != nil {
return nil, errors.Wrap(err, "error creating block blob client")
}

res, err := blobClient.Download(ctx, &azblob.BlobDownloadOptions{})
res, err := f.client.DownloadStream(ctx, f.config.Container, key, nil)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed to download blob %s", key)
}

return res.RawResponse.Body, nil
return res.Body, nil
}

type ciProvider struct {
content.Provider
desc ocispecs.Descriptor
containerClient *azblob.ContainerClient
config *Config
checkMutex sync.Mutex
checked bool
desc ocispecs.Descriptor
client *Client
checkMutex sync.Mutex
checked bool
}

func (p *ciProvider) Info(ctx context.Context, dgst digest.Digest) (content.Info, error) {
Expand All @@ -231,8 +214,8 @@ func (p *ciProvider) Info(ctx context.Context, dgst digest.Digest) (content.Info
p.checkMutex.Lock()
defer p.checkMutex.Unlock()

key := blobKey(p.config, dgst.String())
exists, err := blobExists(ctx, p.containerClient, key)
key := p.client.blobKey(dgst.String())
exists, err := p.client.blobExists(ctx, key)
if err != nil {
return content.Info{}, err
}
Expand Down
Loading
Loading