From d44b718bf0520c909d3d4bf382dc293af4698e6a Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Mon, 3 Mar 2025 10:00:43 +0400 Subject: [PATCH] *: Extend logs Signed-off-by: Evgenii Baidakov --- api/handler/tagging.go | 4 ++++ api/layer/multipart_upload.go | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/api/handler/tagging.go b/api/handler/tagging.go index ec4d3b0c..b3121765 100644 --- a/api/handler/tagging.go +++ b/api/handler/tagging.go @@ -14,6 +14,7 @@ import ( "github.com/nspcc-dev/neofs-s3-gw/api/layer" "github.com/nspcc-dev/neofs-s3-gw/api/s3errors" "go.uber.org/zap" + "golang.org/x/exp/maps" ) const ( @@ -87,6 +88,8 @@ func (h *handler) PutObjectTaggingHandler(w http.ResponseWriter, r *http.Request h.log.Error("couldn't send notification: %w", zap.Error(err)) } + h.log.Debug("PutObjectTagging", zap.Strings("tags", maps.Keys(tagSet))) + w.WriteHeader(http.StatusOK) } @@ -141,6 +144,7 @@ func (h *handler) GetObjectTaggingHandler(w http.ResponseWriter, r *http.Request if err = api.EncodeToResponse(w, encodeTagging(tagSet)); err != nil { h.logAndSendError(w, "something went wrong", reqInfo, err) } + h.log.Debug("GutObjectTagging", zap.Strings("tags", maps.Keys(tagSet))) } func (h *handler) DeleteObjectTaggingHandler(w http.ResponseWriter, r *http.Request) { diff --git a/api/layer/multipart_upload.go b/api/layer/multipart_upload.go index 14068304..805c3df8 100644 --- a/api/layer/multipart_upload.go +++ b/api/layer/multipart_upload.go @@ -1093,6 +1093,9 @@ func (n *layer) multipartMetaGetPartsAfter(ctx context.Context, bktInfo *data.Bu } } + // Sort parts by part number, then by server creation time to make actual last uploaded parts with the same number. + slices.SortFunc(parts, data.SortPartInfo) + return parts, nil } @@ -1185,7 +1188,7 @@ func (n *layer) reUploadSegmentedPart(ctx context.Context, uploadParams UploadPa uploadParams.Size = part.Size uploadParams.Reader = pipeReader - n.log.Debug("reUploadPart", zap.String("oid", part.OID.String()), zap.Int64("payload size", uploadParams.Size)) + n.log.Debug("reUploadSegmentedPart", zap.String("oid", part.OID.String()), zap.Int64("payload size", uploadParams.Size), zap.Int("part", part.Number)) if _, err := n.uploadPart(ctx, multipartInfo, &uploadParams); err != nil { return fmt.Errorf("upload id=%s: %w", part.OID.String(), err) }