Skip to content

Commit

Permalink
*: Extend logs
Browse files Browse the repository at this point in the history
Signed-off-by: Evgenii Baidakov <evgenii@nspcc.io>
  • Loading branch information
smallhive committed Mar 3, 2025
1 parent 74bb47f commit d44b718
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions api/handler/tagging.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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)
}

Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 4 additions & 1 deletion api/layer/multipart_upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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)
}
Expand Down

0 comments on commit d44b718

Please sign in to comment.