From 38b3da3c21500ca256565730c3a0aa59f32cb260 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 29 Feb 2024 16:58:05 +0800 Subject: [PATCH] fix: fix the error --- pkg/common/db/s3/cont/controller.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/common/db/s3/cont/controller.go b/pkg/common/db/s3/cont/controller.go index ce3416592..e0048817b 100644 --- a/pkg/common/db/s3/cont/controller.go +++ b/pkg/common/db/s3/cont/controller.go @@ -89,7 +89,7 @@ func (c *Controller) GetHashObject(ctx context.Context, hash string) (*s3.Object func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64, expire time.Duration, maxParts int) (*InitiateUploadResult, error) { defer log.ZDebug(ctx, "return") - log.ZInfo(ctx, "InitiateUpload", "hash", hash, "size", expire, "config") + log.ZInfo(ctx, "InitiateUpload", "hash", hash, "size", expire) if size < 0 { return nil, errors.New("invalid size") } @@ -112,11 +112,13 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64 } log.ZDebug(ctx, "InitiateUpload 4444444444444444444444444444444") if info, err := c.StatObject(ctx, c.HashPath(hash)); err == nil { + log.ZDebug(ctx, "InitiateUpload 55555555555555555555555555555555") return nil, &HashAlreadyExistsError{Object: info} } else if !c.impl.IsNotFound(err) { + log.ZDebug(ctx, "InitiateUpload 66666666666666666666666666666666", err) return nil, err } - log.ZDebug(ctx, "InitiateUpload 55555555555555555555555555555555") + if size <= partSize { // 预签名上传 key := path.Join(tempPath, c.NowPath(), fmt.Sprintf("%s_%d_%s.presigned", hash, size, c.UUID())) @@ -124,7 +126,6 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64 if err != nil { return nil, err } - log.ZDebug(ctx, "InitiateUpload 999999999999999999999999") return &InitiateUploadResult{ UploadID: newMultipartUploadID(multipartUploadID{ Type: UploadTypePresigned, @@ -145,7 +146,6 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64 }, nil } else { // 分片上传 - log.ZDebug(ctx, "InitiateUpload 66666666666666666666666666666666") upload, err := c.impl.InitiateMultipartUpload(ctx, c.HashPath(hash)) if err != nil { return nil, err @@ -164,7 +164,6 @@ func (c *Controller) InitiateUpload(ctx context.Context, hash string, size int64 return nil, err } } - log.ZDebug(ctx, "InitiateUpload 7777777777777777777777777") return &InitiateUploadResult{ UploadID: newMultipartUploadID(multipartUploadID{ Type: UploadTypeMultipart,