mbiryukova/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

[#754] Remove duplicating CID/OID logging calls

Browse source 
Signed-off-by: Artem Tataurov <a.tataurov@yadro.com>
(cherry picked from commit 8c178fc3c7265fecc897a2526419bb748847c668)
This commit is contained in:
Artem Tataurov 2022-12-21 10:21:48 +03:00 committed by Alex Vanin
parent af7fbd6f32
commit 8e14ccad9f
4 changed files with 2 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/handler/multipart_upload.go
View file

@ -348,13 +348,6 @@ func (h *handler) UploadPartCopy(w http.ResponseWriter, r *http.Request) {
return return
} }
h.log.Debug("copy details",
zap.String("reqId", reqInfo.RequestID),
zap.String("bucket", reqInfo.BucketName),
zap.Stringer("cid", bktInfo.CID),
zap.String("object", reqInfo.ObjectName),
zap.Stringer("oid", info.ID))
response := UploadPartCopyResponse{ response := UploadPartCopyResponse{
ETag: info.HashSum, ETag: info.HashSum,
LastModified: info.Created.UTC().Format(time.RFC3339), LastModified: info.Created.UTC().Format(time.RFC3339),

6
api/handler/put.go
View file

@ -730,8 +730,8 @@ func (h *handler) CreateBucketHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
h.log.Debug("target details", zap.String("reqId", reqInfo.RequestID), h.log.Info("bucket is created", zap.String("reqId", reqInfo.RequestID),
zap.String("bucket", reqInfo.BucketName), zap.Stringer("cid", bktInfo.CID)) zap.String("bucket", reqInfo.BucketName), zap.Stringer("container_id", bktInfo.CID))
if p.ObjectLockEnabled { if p.ObjectLockEnabled {
sp := &layer.PutSettingsParams{ sp := &layer.PutSettingsParams{
@ -745,8 +745,6 @@ func (h *handler) CreateBucketHandler(w http.ResponseWriter, r *http.Request) {
} }
} }
h.log.Info("bucket is created", zap.Stringer("container_id", bktInfo.CID))
api.WriteSuccessResponseHeadersOnly(w) api.WriteSuccessResponseHeadersOnly(w)
} }

21
api/handler/tagging.go
View file

@ -52,13 +52,6 @@ func (h *handler) PutObjectTaggingHandler(w http.ResponseWriter, r *http.Request
return return
} }
h.log.Debug("target details",
zap.String("reqId", reqInfo.RequestID),
zap.String("bucket", reqInfo.BucketName),
zap.Stringer("cid", bktInfo.CID),
zap.String("object", reqInfo.ObjectName),
zap.Stringer("oid", nodeVersion.OID))
s := &SendNotificationParams{ s := &SendNotificationParams{
Event: EventObjectTaggingPut, Event: EventObjectTaggingPut,
NotificationInfo: &data.NotificationInfo{ NotificationInfo: &data.NotificationInfo{
@ -106,13 +99,6 @@ func (h *handler) GetObjectTaggingHandler(w http.ResponseWriter, r *http.Request
return return
} }
h.log.Debug("target details",
zap.String("reqId", reqInfo.RequestID),
zap.String("bucket", reqInfo.BucketName),
zap.Stringer("cid", bktInfo.CID),
zap.String("object", reqInfo.ObjectName),
zap.String("oid", versionID))
if settings.VersioningEnabled() { if settings.VersioningEnabled() {
w.Header().Set(api.AmzVersionID, versionID) w.Header().Set(api.AmzVersionID, versionID)
} }
@ -142,13 +128,6 @@ func (h *handler) DeleteObjectTaggingHandler(w http.ResponseWriter, r *http.Requ
return return
} }
h.log.Debug("target details",
zap.String("reqId", reqInfo.RequestID),
zap.String("bucket", reqInfo.BucketName),
zap.Stringer("cid", bktInfo.CID),
zap.String("object", reqInfo.ObjectName),
zap.Stringer("oid", nodeVersion.OID))
s := &SendNotificationParams{ s := &SendNotificationParams{
Event: EventObjectTaggingDelete, Event: EventObjectTaggingDelete,
NotificationInfo: &data.NotificationInfo{ NotificationInfo: &data.NotificationInfo{

10
api/layer/multipart_upload.go
View file

@ -543,11 +543,6 @@ func (n *layer) AbortMultipartUpload(ctx context.Context, p *UploadInfoParams) e
} }
for _, info := range parts { for _, info := range parts {
reqInfo := api.GetReqInfo(ctx)
n.log.Debug("part details",
zap.String("reqId", reqInfo.RequestID),
zap.String("bucket", p.Bkt.Name), zap.Stringer("cid", p.Bkt.CID),
zap.String("object", info.Key), zap.Stringer("oid", info.OID))
if err = n.objectDelete(ctx, p.Bkt, info.OID); err != nil { if err = n.objectDelete(ctx, p.Bkt, info.OID); err != nil {
n.log.Warn("couldn't delete part", zap.String("cid", p.Bkt.CID.EncodeToString()), n.log.Warn("couldn't delete part", zap.String("cid", p.Bkt.CID.EncodeToString()),
zap.String("oid", info.OID.EncodeToString()), zap.Int("part number", info.Number), zap.Error(err)) zap.String("oid", info.OID.EncodeToString()), zap.Int("part number", info.Number), zap.Error(err))
@ -575,11 +570,6 @@ func (n *layer) ListParts(ctx context.Context, p *ListPartsParams) (*ListPartsIn
parts := make([]*Part, 0, len(partsInfo)) parts := make([]*Part, 0, len(partsInfo))
for _, partInfo := range partsInfo { for _, partInfo := range partsInfo {
reqInfo := api.GetReqInfo(ctx)
n.log.Debug("part details",
zap.String("reqId", reqInfo.RequestID),
zap.String("container", p.Info.Bkt.Name), zap.Stringer("cid", p.Info.Bkt.CID),
zap.String("object", partInfo.Key), zap.Stringer("oid", partInfo.OID))
parts = append(parts, &Part{ parts = append(parts, &Part{
ETag: partInfo.ETag, ETag: partInfo.ETag,
LastModified: partInfo.Created.UTC().Format(time.RFC3339), LastModified: partInfo.Created.UTC().Format(time.RFC3339),