TrueCloudLab/frostfs-s3-gw
17
3
Fork 20
Code Issues 18 Pull requests 7 Projects Releases 36 Packages 1 Activity Actions

[#605] Fix panic when payload discard
Some checks failed
/ DCO (pull_request) Successful in 30s
Details
/ Vulncheck (pull_request) Successful in 1m7s
Details
/ Builds (pull_request) Successful in 1m31s
Details
/ Lint (pull_request) Successful in 2m4s
Details
/ Tests (pull_request) Successful in 1m8s
Details
/ OCI image (pull_request) Successful in 2m10s
Details
/ Builds (push) Has been cancelled
Details
/ OCI image (push) Has been cancelled
Details
/ Lint (push) Has been cancelled
Details
/ Vulncheck (push) Has been cancelled
Details
/ Tests (push) Has been cancelled
Details

Browse source 
Signed-off-by: Roman Loginov <r.loginov@yadro.com>
This commit is contained in:
Roman Loginov 2025-01-27 09:23:09 +03:00
parent 250538a9b4
commit e7a8d4bdaf
3 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/layer/object.go
View file

@ -525,10 +525,7 @@ func (n *Layer) objectPutAndHash(ctx context.Context, prm frostfs.PrmObjectCreat
})
res, err := n.frostFS.CreateObject(ctx, prm)
if err != nil {
if _, errDiscard := io.Copy(io.Discard, prm.Payload); errDiscard != nil {
n.reqLogger(ctx).Warn(logs.FailedToDiscardPutPayloadProbablyGoroutineLeaks, zap.Error(errDiscard))
}
n.payloadDiscard(ctx, prm.Payload)
return nil, err
}
return &data.CreatedObjectInfo{
@ -540,6 +537,14 @@ func (n *Layer) objectPutAndHash(ctx context.Context, prm frostfs.PrmObjectCreat
}, nil
}
func (n *Layer) payloadDiscard(ctx context.Context, payload io.Reader) {
if payload != nil {
if _, errDiscard := io.Copy(io.Discard, payload); errDiscard != nil {
n.reqLogger(ctx).Warn(logs.FailedToDiscardPutPayloadProbablyGoroutineLeaks, zap.Error(errDiscard))
}
}
}
type logWrapper struct {
log *zap.Logger
}