diff --git a/README.md b/README.md index e898e49..2923408 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ Contains client for working with FrostFS. ```go var prmInit client.PrmInit prmInit.SetDefaultPrivateKey(key) // private key for request signing -prmInit.ResolveFrostFSFailures() // enable erroneous status parsing var c client.Client c.Init(prmInit) @@ -77,8 +76,7 @@ if needed and perform any desired action. In the case above we may want to repor these details to the user as well as retry an operation, possibly with different parameters. Status wire-format is extendable and each node can report any set of details it wants. The set of reserved status codes can be found in -[FrostFS API](https://git.frostfs.info/TrueCloudLab/frostfs-api/src/branch/master/status/types.proto). There is also -a `client.PrmInit.ResolveFrostFSFailures()` to seamlessly convert erroneous statuses into Go error type. +[FrostFS API](https://git.frostfs.info/TrueCloudLab/frostfs-api/src/branch/master/status/types.proto). ### policy Contains helpers allowing conversion of placing policy from/to JSON representation diff --git a/client/accounting.go b/client/accounting.go index 021b26a..c47de31 100644 --- a/client/accounting.go +++ b/client/accounting.go @@ -64,9 +64,9 @@ func (x ResBalanceGet) Amount() accounting.Decimal { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`, -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmBalanceGet docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/client.go b/client/client.go index 3942390..ba57b41 100644 --- a/client/client.go +++ b/client/client.go @@ -144,7 +144,7 @@ func (c *Client) Close() error { // // See also Init. type PrmInit struct { - resolveFrostFSErrors bool + disableFrostFSErrorResolution bool key ecdsa.PrivateKey @@ -161,12 +161,16 @@ func (x *PrmInit) SetDefaultPrivateKey(key ecdsa.PrivateKey) { x.key = key } -// ResolveFrostFSFailures makes the Client to resolve failure statuses of the -// FrostFS protocol into Go built-in errors. These errors are returned from -// each protocol operation. By default, statuses aren't resolved and written -// to the resulting structure (see corresponding Res* docs). +// Deprecated: method is no-op. Option is default. func (x *PrmInit) ResolveFrostFSFailures() { - x.resolveFrostFSErrors = true +} + +// DisableFrostFSFailuresResolution makes the Client to preserve failure statuses of the +// FrostFS protocol only in resulting structure (see corresponding Res* docs). +// These errors are returned from each protocol operation. By default, statuses +// are resolved and returned as a Go built-in errors. +func (x *PrmInit) DisableFrostFSFailuresResolution() { + x.disableFrostFSErrorResolution = true } // SetResponseInfoCallback makes the Client to pass ResponseMetaInfo from each diff --git a/client/common.go b/client/common.go index 3895b00..ac9feb0 100644 --- a/client/common.go +++ b/client/common.go @@ -119,7 +119,7 @@ func (c *Client) processResponse(resp responseV2) (apistatus.Status, error) { } st := apistatus.FromStatusV2(resp.GetMetaHeader().GetStatus()) - if c.prm.resolveFrostFSErrors { + if !c.prm.disableFrostFSErrorResolution { return st, apistatus.ErrFromStatus(st) } return st, nil diff --git a/client/container_delete.go b/client/container_delete.go index 181c15b..f750c90 100644 --- a/client/container_delete.go +++ b/client/container_delete.go @@ -101,9 +101,9 @@ type ResContainerDelete struct { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Operation is asynchronous and no guaranteed even in the absence of errors. // The required time is also not predictable. diff --git a/client/container_eacl.go b/client/container_eacl.go index 2acde86..d577b7a 100644 --- a/client/container_eacl.go +++ b/client/container_eacl.go @@ -68,9 +68,9 @@ func (x ResContainerEACL) Table() eacl.Table { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmContainerEACL docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/container_get.go b/client/container_get.go index d2ef0fe..4477973 100644 --- a/client/container_get.go +++ b/client/container_get.go @@ -71,9 +71,9 @@ func (x ResContainerGet) Container() container.Container { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmContainerGet docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/container_list.go b/client/container_list.go index eb8cc88..4197d3d 100644 --- a/client/container_list.go +++ b/client/container_list.go @@ -65,9 +65,9 @@ func (x ResContainerList) Containers() []cid.ID { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmContainerList docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/container_put.go b/client/container_put.go index f186abd..6ff4e5f 100644 --- a/client/container_put.go +++ b/client/container_put.go @@ -110,9 +110,9 @@ func (x ResContainerPut) ID() cid.ID { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Operation is asynchronous and no guaranteed even in the absence of errors. // The required time is also not predictable. diff --git a/client/container_set_eacl.go b/client/container_set_eacl.go index 0ea89aa..8ad808f 100644 --- a/client/container_set_eacl.go +++ b/client/container_set_eacl.go @@ -101,9 +101,9 @@ type ResContainerSetEACL struct { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Operation is asynchronous and no guaranteed even in the absence of errors. // The required time is also not predictable. diff --git a/client/container_space.go b/client/container_space.go index c066c0a..793f5f4 100644 --- a/client/container_space.go +++ b/client/container_space.go @@ -57,9 +57,9 @@ type ResAnnounceSpace struct { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Operation is asynchronous and no guaranteed even in the absence of errors. // The required time is also not predictable. diff --git a/client/netmap.go b/client/netmap.go index 80d1ded..c06f940 100644 --- a/client/netmap.go +++ b/client/netmap.go @@ -53,9 +53,9 @@ func (x ResEndpointInfo) NodeInfo() netmap.NodeInfo { // Method can be used as a health check to see if node is alive and responds to requests. // // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmEndpointInfo docs). // Context is required and must not be nil. It is used for network communication. @@ -140,9 +140,9 @@ func (x ResNetworkInfo) Info() netmap.NetworkInfo { // NetworkInfo requests information about the FrostFS network of which the remote server is a part. // // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmNetworkInfo docs). // Context is required and must not be nil. It is used for network communication. @@ -204,9 +204,9 @@ func (x ResNetMapSnapshot) NetMap() netmap.NetMap { // NetMapSnapshot requests current network view of the remote server. // // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly. // Context is required and MUST NOT be nil. It is used for network communication. diff --git a/client/netmap_test.go b/client/netmap_test.go index 76920a1..bce6b3a 100644 --- a/client/netmap_test.go +++ b/client/netmap_test.go @@ -67,6 +67,7 @@ func TestClient_NetMapSnapshot(t *testing.T) { var res *ResNetMapSnapshot var srv serverNetMap c := newClient(&srv) + c.prm.DisableFrostFSFailuresResolution() ctx := context.Background() // request signature diff --git a/client/object_delete.go b/client/object_delete.go index 993cd5d..3f72e0c 100644 --- a/client/object_delete.go +++ b/client/object_delete.go @@ -112,9 +112,9 @@ func (prm *PrmObjectDelete) buildRequest(c *Client) (*v2object.DeleteRequest, er // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`, -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmObjectDelete docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/object_get.go b/client/object_get.go index 56cbfda..03b91d2 100644 --- a/client/object_get.go +++ b/client/object_get.go @@ -444,9 +444,9 @@ func (prm *PrmObjectHead) buildRequest(c *Client) (*v2object.HeadRequest, error) // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`, -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmObjectHead docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/object_hash.go b/client/object_hash.go index 7fdf335..e65e948 100644 --- a/client/object_hash.go +++ b/client/object_hash.go @@ -152,9 +152,9 @@ func (prm *PrmObjectHash) buildRequest(c *Client) (*v2object.GetRangeHashRequest // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`, -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmObjectHash docs). // Context is required and must not be nil. It is used for network communication. diff --git a/client/object_put_transformer.go b/client/object_put_transformer.go index 402ad00..1fa474e 100644 --- a/client/object_put_transformer.go +++ b/client/object_put_transformer.go @@ -83,7 +83,7 @@ func (it *internalTarget) putAsStream(ctx context.Context, o *object.Object) err wrt.WritePayloadChunk(ctx, o.Payload()) } it.res, err = wrt.Close(ctx) - if err == nil && !it.client.prm.resolveFrostFSErrors && !apistatus.IsSuccessful(it.res.st) { + if err == nil && it.client.prm.disableFrostFSErrorResolution && !apistatus.IsSuccessful(it.res.st) { err = apistatus.ErrFromStatus(it.res.st) } return err @@ -110,7 +110,7 @@ func (it *internalTarget) tryPutSingle(ctx context.Context, o *object.Object) (b statusRes: res.statusRes, obj: id, } - if !it.client.prm.resolveFrostFSErrors && !apistatus.IsSuccessful(it.res.st) { + if it.client.prm.disableFrostFSErrorResolution && !apistatus.IsSuccessful(it.res.st) { return true, apistatus.ErrFromStatus(it.res.st) } return true, nil diff --git a/client/session.go b/client/session.go index b3ec722..03ed5e8 100644 --- a/client/session.go +++ b/client/session.go @@ -89,9 +89,9 @@ func (x ResSessionCreate) PublicKey() []byte { // // Exactly one return value is non-nil. By default, server status is returned in res structure. // Any client's internal or transport errors are returned as `error`. -// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful -// FrostFS status codes are returned as `error`, otherwise, are included -// in the returned result structure. +// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful +// FrostFS status codes are included in the returned result structure, +// otherwise, are also returned as `error`. // // Returns an error if parameters are set incorrectly (see PrmSessionCreate docs). // Context is required and must not be nil. It is used for network communication.