From 7c3eb342750f6f408c75a148af777cb0079f0b26 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 29 Feb 2024 17:29:00 +0800 Subject: [PATCH] fix: find error --- pkg/common/db/s3/minio/minio.go | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index 9b6fd8857..a8a975ad0 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -107,7 +107,7 @@ func NewMinio(cache cache.MinioCache, config *config.GlobalConfig) (s3.Interface } ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - if err := m.initMinio(ctx, config); err != nil { + if err := m.initMinio(ctx); err != nil { fmt.Println("init minio error:", err) } return m, nil @@ -127,7 +127,7 @@ type Minio struct { config *config.GlobalConfig } -func (m *Minio) initMinio(ctx context.Context, config *config.GlobalConfig) error { +func (m *Minio) initMinio(ctx context.Context) error { if m.init { return nil } @@ -136,7 +136,8 @@ func (m *Minio) initMinio(ctx context.Context, config *config.GlobalConfig) erro if m.init { return nil } - conf := config.Object.Minio + conf := m.config.Object.Minio + log.ZDebug(ctx, "initMinio m.config.Object.Minio ***************9999999999999999999999999999999999") exists, err := m.core.Client.BucketExists(ctx, conf.Bucket) if err != nil { return fmt.Errorf("check bucket exists error: %w", err) @@ -199,7 +200,7 @@ func (m *Minio) PartLimit() *s3.PartLimit { } func (m *Minio) InitiateMultipartUpload(ctx context.Context, name string) (*s3.InitiateMultipartUploadResult, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } uploadID, err := m.core.NewMultipartUpload(ctx, m.bucket, name, minio.PutObjectOptions{}) @@ -214,7 +215,7 @@ func (m *Minio) InitiateMultipartUpload(ctx context.Context, name string) (*s3.I } func (m *Minio) CompleteMultipartUpload(ctx context.Context, uploadID string, name string, parts []s3.Part) (*s3.CompleteMultipartUploadResult, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } minioParts := make([]minio.CompletePart, len(parts)) @@ -255,7 +256,7 @@ func (m *Minio) PartSize(ctx context.Context, size int64) (int64, error) { } func (m *Minio) AuthSign(ctx context.Context, uploadID string, name string, expire time.Duration, partNumbers []int) (*s3.AuthSignResult, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } creds, err := m.opts.Creds.Get() @@ -288,7 +289,7 @@ func (m *Minio) AuthSign(ctx context.Context, uploadID string, name string, expi } func (m *Minio) PresignedPutObject(ctx context.Context, name string, expire time.Duration) (string, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return "", err } rawURL, err := m.sign.PresignedPutObject(ctx, m.bucket, name, expire) @@ -302,20 +303,22 @@ func (m *Minio) PresignedPutObject(ctx context.Context, name string, expire time } func (m *Minio) DeleteObject(ctx context.Context, name string) error { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return err } return m.core.Client.RemoveObject(ctx, m.bucket, name, minio.RemoveObjectOptions{}) } func (m *Minio) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } + log.ZDebug(ctx, "StatObject !!!!!!1111111111111111111111111111111111") info, err := m.core.Client.StatObject(ctx, m.bucket, name, minio.StatObjectOptions{}) if err != nil { return nil, err } + log.ZDebug(ctx, "StatObject !!!!!!22222222222222222222222222222222222") return &s3.ObjectInfo{ ETag: strings.ToLower(info.ETag), Key: info.Key, @@ -325,7 +328,7 @@ func (m *Minio) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, er } func (m *Minio) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyObjectInfo, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } result, err := m.core.Client.CopyObject(ctx, minio.CopyDestOptions{ @@ -359,14 +362,14 @@ func (m *Minio) IsNotFound(err error) bool { } func (m *Minio) AbortMultipartUpload(ctx context.Context, uploadID string, name string) error { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return err } return m.core.AbortMultipartUpload(ctx, m.bucket, name, uploadID) } func (m *Minio) ListUploadedParts(ctx context.Context, uploadID string, name string, partNumberMarker int, maxParts int) (*s3.ListUploadedPartsResult, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } result, err := m.core.ListObjectParts(ctx, m.bucket, name, uploadID, partNumberMarker, maxParts) @@ -416,7 +419,7 @@ func (m *Minio) PresignedGetObject(ctx context.Context, name string, expire time } func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return "", err } reqParams := make(url.Values) @@ -447,7 +450,7 @@ func (m *Minio) getObjectData(ctx context.Context, name string, limit int64) ([] } func (m *Minio) FormData(ctx context.Context, name string, size int64, contentType string, duration time.Duration) (*s3.FormData, error) { - if err := m.initMinio(ctx, m.config); err != nil { + if err := m.initMinio(ctx); err != nil { return nil, err } policy := minio.NewPostPolicy()