TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 4 Projects Releases 2 Activity Actions

[#2024] services/object: Unify status errors

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
Evgenii Stratonikov 2022-11-08 15:12:52 +03:00 committed by fyrchik
parent 3875fef542
commit aa478f1def
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -15,7 +15,7 @@ Changelog for NeoFS Node
- `neofs-cli container nodes`'s output (#1991) - `neofs-cli container nodes`'s output (#1991)
- Increase error counter for write-cache flush errors (#1818) - Increase error counter for write-cache flush errors (#1818)
- Correctly select the shard for applying tree service operations (#1996) - Correctly select the shard for applying tree service operations (#1996)
- Do not panic with bad inputs for `GET_RANGE` (#2007) - Do not panic and return correct errors for bad inputs in `GET_RANGE` (#2007, #2024)
- Physical child object removal by GC (#1699) - Physical child object removal by GC (#1699)
- Broadcasting helper objects (#1972) - Broadcasting helper objects (#1972)
- `neofs-cli lock object`'s `lifetime` flag handling (#1972) - `neofs-cli lock object`'s `lifetime` flag handling (#1972)

2
pkg/services/object/get/assemble.go
View file

@ -96,7 +96,7 @@ func (exec *execCtx) initFromChild(obj oid.ID) (prev *oid.ID, children []oid.ID)
if seekTo < seekOff || parSize < seekOff || parSize < seekTo { if seekTo < seekOff || parSize < seekOff || parSize < seekTo {
var errOutOfRange apistatus.ObjectOutOfRange var errOutOfRange apistatus.ObjectOutOfRange
exec.err = errOutOfRange exec.err = &errOutOfRange
exec.status = statusOutOfRange exec.status = statusOutOfRange
return return

2
pkg/services/object/get/util.go
View file

@ -156,7 +156,7 @@ func (c *clientWrapper) getObject(exec *execCtx, info coreclient.NodeInfo) (*obj
to := from + rng.GetLength() to := from + rng.GetLength()
if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to { if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to {
return nil, apistatus.ObjectOutOfRange{} return nil, new(apistatus.ObjectOutOfRange)
} }
return payloadOnlyObject(payload[from:to]), nil return payloadOnlyObject(payload[from:to]), nil

5
pkg/services/object/internal/client/client.go
View file

@ -330,7 +330,8 @@ const maxInitialBufferSize = 1024 * 1024 // 1 MiB
// Returns: // Returns:
// //
// error of type *object.SplitInfoError if object raw flag is set and requested object is virtual; // error of type *object.SplitInfoError if object raw flag is set and requested object is virtual;
// error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed. // error of type *apistatus.ObjectAlreadyRemoved if the requested object is marked to be removed;
// error of type *apistatus.ObjectOutOfRange if the requested range is too big.
// //
// PayloadRange ignores the provided session if it is not related to the requested object. // PayloadRange ignores the provided session if it is not related to the requested object.
func PayloadRange(prm PayloadRangePrm) (*PayloadRangeRes, error) { func PayloadRange(prm PayloadRangePrm) (*PayloadRangeRes, error) {
@ -359,7 +360,7 @@ func PayloadRange(prm PayloadRangePrm) (*PayloadRangeRes, error) {
// `CopyN` expects `int64`, this check ensures that the result is positive. // `CopyN` expects `int64`, this check ensures that the result is positive.
// On practice this means that we can return incorrect results for objects // On practice this means that we can return incorrect results for objects
// with size > 8_388 Petabytes, this will be fixed later with support for streaming. // with size > 8_388 Petabytes, this will be fixed later with support for streaming.
return nil, apistatus.ObjectOutOfRange{} return nil, new(apistatus.ObjectOutOfRange)
} }
ln := prm.ln ln := prm.ln