Release v0.30.1

Signed-off-by: Alex Vanin <a.vanin@yadro.com>

CHANGELOG.md

@@ -4,6 +4,14 @@ This document outlines major changes between releases.
 
 ## [Unreleased]
 
+## [0.30.1] - 2024-08-20
+
+### Fixed
+- Error counting in pool component before connection switch (#131)
+
+### Added
+- Log of endpoint address during tree pool errors (#131)
+
 ## [0.30.0] - Kangshung - 2024-07-22
 
 ### Fixed
@@ -120,4 +128,5 @@ To see CHANGELOG for older versions, refer to https://github.com/nspcc-dev/neofs
 [0.28.1]: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/compare/v0.28.0...v0.28.1
 [0.29.0]: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/compare/v0.28.1...v0.29.0
 [0.30.0]: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/compare/v0.29.0...v0.30.0
-[Unreleased]: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/compare/v0.30.0...master
+[0.30.1]: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/compare/v0.30.0...v0.30.1
+[Unreleased]: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/compare/v0.30.1...master

VERSION

@@ -1 +1 @@
-v0.30.0
+v0.30.1

cmd/http-gw/integration_test.go

@@ -522,10 +522,10 @@ func putObject(ctx context.Context, t *testing.T, clientPool *pool.Pool, ownerID
 	prm.SetHeader(*obj)
 	prm.SetPayload(bytes.NewBufferString(content))
 
-	id, err := clientPool.PutObject(ctx, prm)
+	res, err := clientPool.PutObject(ctx, prm)
 	require.NoError(t, err)
 
-	return id
+	return res.ObjectID
 }
 
 func makeBearerToken(t *testing.T, key *keys.PrivateKey, ownerID user.ID, version string) string {

go.mod

@@ -3,9 +3,9 @@ module git.frostfs.info/TrueCloudLab/frostfs-http-gw
 go 1.21
 
 require (
-	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240716113920-f517e3949164
+	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240726072425-3dfa2f4fd65e
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240718141740-ce8270568d36
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240820094724-848446231082
 	git.frostfs.info/TrueCloudLab/zapjournald v0.0.0-20240124114243-cb2e66427d02
 	github.com/bluele/gcache v0.0.2
 	github.com/fasthttp/router v1.4.1

go.sum

@@ -37,16 +37,16 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240716113920-f517e3949164 h1:XxvwQKJT/f16qS3df5PBQPRYKkhy0/A7zH6644QpKD0=
-git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240716113920-f517e3949164/go.mod h1:OBDSr+DqV1z4VDouoX3YMleNc4DPBVBWTG3WDT2PK1o=
+git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240726072425-3dfa2f4fd65e h1:gEWT+70E/RvGkxtSv+PlyUN2vtJVymhQa1mypvrXukM=
+git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240726072425-3dfa2f4fd65e/go.mod h1:OBDSr+DqV1z4VDouoX3YMleNc4DPBVBWTG3WDT2PK1o=
 git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240621131249-49e5270f673e h1:kcBqZBiFIUBATUqEuvVigtkJJWQ2Gug/eYXn967o3M4=
 git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240621131249-49e5270f673e/go.mod h1:F/fe1OoIDKr5Bz99q4sriuHDuf3aZefZy9ZsCqEtgxc=
 git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 h1:FxqFDhQYYgpe41qsIHVOcdzSVCB8JNSfPG7Uk4r2oSk=
 git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0/go.mod h1:RUIKZATQLJ+TaYQa60X2fTDwfuhMfm8Ar60bQ5fr+vU=
 git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6 h1:aGQ6QaAnTerQ5Dq5b2/f9DUQtSqPkZZ/bkMx/HKuLCo=
 git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6/go.mod h1:W8Nn08/l6aQ7UlIbpF7FsQou7TVpcRD1ZT1KG4TrFhE=
-git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240718141740-ce8270568d36 h1:MV/vKJWLQT34RRbXYvkNKFYGNjL5bRNuCQMXkbC7fLI=
-git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240718141740-ce8270568d36/go.mod h1:vluJ/+yQMcq8ZIZZSA7Te+JKClr0lgtRErjICvb8wto=
+git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240820094724-848446231082 h1:FfjbUcouQkmvzsz7/cq0/5cxP2ivGjIwUXQPHliIYxU=
+git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240820094724-848446231082/go.mod h1:DlJmgV4/qkFkx2ab+YWznlMijiF2yZHnrJswJOB7XGs=
 git.frostfs.info/TrueCloudLab/hrw v1.2.1 h1:ccBRK21rFvY5R1WotI6LNoPlizk7qSvdfD8lNIRudVc=
 git.frostfs.info/TrueCloudLab/hrw v1.2.1/go.mod h1:C1Ygde2n843yTZEQ0FP69jYiuaYV0kriLvP4zm8JuvM=
 git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 h1:M2KR3iBj7WpY3hP10IevfIB9MURr4O9mwVfJ+SjT3HA=

internal/frostfs/frostfs.go

@@ -11,7 +11,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool"
 	"google.golang.org/grpc/codes"
@@ -59,8 +58,8 @@ func (x *FrostFS) CreateObject(ctx context.Context, prm handler.PrmObjectCreate)
 		prmPut.UseBearer(*prm.BearerToken)
 	}
 
-	idObj, err := x.pool.PutObject(ctx, prmPut)
-	return idObj, handleObjectError("save object via connection pool", err)
+	res, err := x.pool.PutObject(ctx, prmPut)
+	return res.ObjectID, handleObjectError("save object via connection pool", err)
 }
 
 // wraps io.ReadCloser and transforms Read errors related to access violation
@@ -77,25 +76,8 @@ func (x payloadReader) Read(p []byte) (int, error) {
 	return n, handleObjectError("read payload", err)
 }
 
-// HeadObject implements frostfs.FrostFS interface method.
-func (x *FrostFS) HeadObject(ctx context.Context, prm handler.PrmObjectHead) (*object.Object, error) {
-	var prmHead pool.PrmObjectHead
-	prmHead.SetAddress(prm.Address)
-
-	if prm.BearerToken != nil {
-		prmHead.UseBearer(*prm.BearerToken)
-	}
-
-	res, err := x.pool.HeadObject(ctx, prmHead)
-	if err != nil {
-		return nil, handleObjectError("read object header via connection pool", err)
-	}
-
-	return &res, nil
-}
-
-// GetObject implements frostfs.FrostFS interface method.
-func (x *FrostFS) GetObject(ctx context.Context, prm handler.PrmObjectGet) (*handler.Object, error) {
+// ReadObject implements frostfs.FrostFS interface method.
+func (x *FrostFS) ReadObject(ctx context.Context, prm handler.PrmObjectRead) (*handler.ObjectPart, error) {
 	var prmGet pool.PrmObjectGet
 	prmGet.SetAddress(prm.Address)
 
@@ -103,19 +85,27 @@ func (x *FrostFS) GetObject(ctx context.Context, prm handler.PrmObjectGet) (*han
 		prmGet.UseBearer(*prm.BearerToken)
 	}
 
-	res, err := x.pool.GetObject(ctx, prmGet)
-	if err != nil {
-		return nil, handleObjectError("init full object reading via connection pool", err)
+	// The code below must be reworked. It was copied from frostfs-s3-gw
+	// to create similar mocks for unit and fuzzing tests.
+	//
+	// However, this code was changed due to specific of expected responses
+	// from HTTP gateway. HTTP Gateway requires two types of responses:
+	// * payload as io.Reader + HEAD request
+	// * only payload as io.Reader
+	// Therefore all unused params were deleted and code was simplified.
+
+	if prm.PayloadRange[0]+prm.PayloadRange[1] == 0 {
+		res, err := x.pool.GetObject(ctx, prmGet)
+		if err != nil {
+			return nil, handleObjectError("init full payload range reading via connection pool", err)
+		}
+
+		return &handler.ObjectPart{
+			Payload: res.Payload,
+			Head:    &res.Header,
+		}, nil
 	}
 
-	return &handler.Object{
-		Header:  res.Header,
-		Payload: res.Payload,
-	}, nil
-}
-
-// RangeObject implements frostfs.FrostFS interface method.
-func (x *FrostFS) RangeObject(ctx context.Context, prm handler.PrmObjectRange) (io.ReadCloser, error) {
 	var prmRange pool.PrmObjectRange
 	prmRange.SetAddress(prm.Address)
 	prmRange.SetOffset(prm.PayloadRange[0])
@@ -130,7 +120,9 @@ func (x *FrostFS) RangeObject(ctx context.Context, prm handler.PrmObjectRange) (
 		return nil, handleObjectError("init payload range reading via connection pool", err)
 	}
 
-	return payloadReader{&res}, nil
+	return &handler.ObjectPart{
+		Payload: payloadReader{&res},
+	}, nil
 }
 
 // SearchObjects implements frostfs.FrostFS interface method.

internal/handler/download.go

@@ -153,19 +153,19 @@ func (h *Handler) DownloadZipped(c *fasthttp.RequestCtx) {
 }
 
 func (h *Handler) zipObject(ctx context.Context, zipWriter *zip.Writer, addr oid.Address, btoken *bearer.Token, bufZip []byte) error {
-	prm := PrmObjectGet{
+	prm := PrmObjectRead{
 		PrmAuth: PrmAuth{
 			BearerToken: btoken,
 		},
 		Address: addr,
 	}
 
-	resGet, err := h.frostfs.GetObject(ctx, prm)
+	resGet, err := h.frostfs.ReadObject(ctx, prm)
 	if err != nil {
 		return fmt.Errorf("get FrostFS object: %v", err)
 	}
 
-	objWriter, err := h.addObjectToZip(zipWriter, &resGet.Header)
+	objWriter, err := h.addObjectToZip(zipWriter, resGet.Head)
 	if err != nil {
 		return fmt.Errorf("zip create header: %v", err)
 	}

internal/handler/frostfs_mock.go

@@ -78,49 +78,32 @@ func (t *TestFrostFS) requestOwner(btoken *bearer.Token) user.ID {
 	return owner
 }
 
-func (t *TestFrostFS) retrieveObject(addr oid.Address, btoken *bearer.Token) (*object.Object, error) {
-	sAddr := addr.EncodeToString()
+func (t *TestFrostFS) ReadObject(_ context.Context, prm PrmObjectRead) (*ObjectPart, error) {
+	sAddr := prm.Address.EncodeToString()
 
 	if obj, ok := t.objects[sAddr]; ok {
-		owner := t.requestOwner(btoken)
+		owner := t.requestOwner(prm.BearerToken)
 
-		if !t.isAllowed(addr.Container(), owner, acl.OpObjectGet, addr.Object()) {
+		if !t.isAllowed(prm.Address.Container(), owner, acl.OpObjectGet, prm.Address.Object()) {
 			return nil, ErrAccessDenied
 		}
 
-		return obj, nil
+		payload := obj.Payload()
+
+		if prm.PayloadRange[0]+prm.PayloadRange[1] > 0 {
+			off := prm.PayloadRange[0]
+			payload = payload[off : off+prm.PayloadRange[1]]
+			obj = nil // GetRange does not return header values
+		}
+
+		return &ObjectPart{
+			Head:    obj,
+			Payload: io.NopCloser(bytes.NewReader(payload)),
+		}, nil
 	}
 
-	return nil, fmt.Errorf("%w: %s", &apistatus.ObjectNotFound{}, addr)
+	return nil, fmt.Errorf("%w: %s", &apistatus.ObjectNotFound{}, prm.Address)
 }
-
-func (t *TestFrostFS) HeadObject(_ context.Context, prm PrmObjectHead) (*object.Object, error) {
-	return t.retrieveObject(prm.Address, prm.BearerToken)
-}
-
-func (t *TestFrostFS) GetObject(_ context.Context, prm PrmObjectGet) (*Object, error) {
-	obj, err := t.retrieveObject(prm.Address, prm.BearerToken)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Object{
-		Header:  *obj,
-		Payload: io.NopCloser(bytes.NewReader(obj.Payload())),
-	}, nil
-}
-
-func (t *TestFrostFS) RangeObject(_ context.Context, prm PrmObjectRange) (io.ReadCloser, error) {
-	obj, err := t.retrieveObject(prm.Address, prm.BearerToken)
-	if err != nil {
-		return nil, err
-	}
-
-	off := prm.PayloadRange[0]
-	payload := obj.Payload()[off : off+prm.PayloadRange[1]]
-	return io.NopCloser(bytes.NewReader(payload)), nil
-}
-
 func (t *TestFrostFS) CreateObject(_ context.Context, prm PrmObjectCreate) (oid.ID, error) {
 	b := make([]byte, 32)
 	if _, err := io.ReadFull(rand.Reader, b); err != nil {

internal/handler/handler.go

@@ -46,26 +46,8 @@ type PrmAuth struct {
 	BearerToken *bearer.Token
 }
 
-// PrmObjectHead groups parameters of FrostFS.HeadObject operation.
-type PrmObjectHead struct {
-	// Authentication parameters.
-	PrmAuth
-
-	// Address to read the object header from.
-	Address oid.Address
-}
-
-// PrmObjectGet groups parameters of FrostFS.GetObject operation.
-type PrmObjectGet struct {
-	// Authentication parameters.
-	PrmAuth
-
-	// Address to read the object header from.
-	Address oid.Address
-}
-
-// PrmObjectRange groups parameters of FrostFS.RangeObject operation.
-type PrmObjectRange struct {
+// PrmObjectRead groups parameters of FrostFS.ReadObject operation.
+type PrmObjectRead struct {
 	// Authentication parameters.
 	PrmAuth
 
@@ -76,10 +58,10 @@ type PrmObjectRange struct {
 	PayloadRange [2]uint64
 }
 
-// Object represents FrostFS object.
-type Object struct {
-	// Object header (doesn't contain payload).
-	Header object.Object
+// ObjectPart represents partially read FrostFS object.
+type ObjectPart struct {
+	// Object header with optional in-memory payload part.
+	Head *object.Object
 
 	// Object payload part encapsulated in io.Reader primitive.
 	// Returns ErrAccessDenied on read access violation.
@@ -133,9 +115,7 @@ var (
 // FrostFS represents virtual connection to FrostFS network.
 type FrostFS interface {
 	Container(context.Context, PrmContainer) (*container.Container, error)
-	HeadObject(context.Context, PrmObjectHead) (*object.Object, error)
-	GetObject(context.Context, PrmObjectGet) (*Object, error)
-	RangeObject(context.Context, PrmObjectRange) (io.ReadCloser, error)
+	ReadObject(context.Context, PrmObjectRead) (*ObjectPart, error)
 	CreateObject(context.Context, PrmObjectCreate) (oid.ID, error)
 	SearchObjects(context.Context, PrmObjectSearch) (ResObjectSearch, error)
 	utils.EpochInfoFetcher

internal/handler/head.go

@@ -29,22 +29,22 @@ func (h *Handler) headObject(ctx context.Context, req request, objectAddress oid
 
 	btoken := bearerToken(ctx)
 
-	prm := PrmObjectHead{
+	prm := PrmObjectRead{
 		PrmAuth: PrmAuth{
 			BearerToken: btoken,
 		},
 		Address: objectAddress,
 	}
 
-	obj, err := h.frostfs.HeadObject(ctx, prm)
+	obj, err := h.frostfs.ReadObject(ctx, prm)
 	if err != nil {
 		req.handleFrostFSErr(err, start)
 		return
 	}
 
-	req.Response.Header.Set(fasthttp.HeaderContentLength, strconv.FormatUint(obj.PayloadSize(), 10))
+	req.Response.Header.Set(fasthttp.HeaderContentLength, strconv.FormatUint(obj.Head.PayloadSize(), 10))
 	var contentType string
-	for _, attr := range obj.Attributes() {
+	for _, attr := range obj.Head.Attributes() {
 		key := attr.Key()
 		val := attr.Value()
 		if !isValidToken(key) || !isValidValue(val) {
@@ -70,11 +70,11 @@ func (h *Handler) headObject(ctx context.Context, req request, objectAddress oid
 		}
 	}
 
-	idsToResponse(&req.Response, obj)
+	idsToResponse(&req.Response, obj.Head)
 
 	if len(contentType) == 0 {
-		contentType, _, err = readContentType(obj.PayloadSize(), func(sz uint64) (io.Reader, error) {
-			prmRange := PrmObjectRange{
+		contentType, _, err = readContentType(obj.Head.PayloadSize(), func(sz uint64) (io.Reader, error) {
+			prmRange := PrmObjectRead{
 				PrmAuth: PrmAuth{
 					BearerToken: btoken,
 				},
@@ -82,7 +82,11 @@ func (h *Handler) headObject(ctx context.Context, req request, objectAddress oid
 				PayloadRange: [2]uint64{0, sz},
 			}
 
-			return h.frostfs.RangeObject(ctx, prmRange)
+			resObj, err := h.frostfs.ReadObject(ctx, prmRange)
+			if err != nil {
+				return nil, err
+			}
+			return resObj.Payload, nil
 		})
 		if err != nil && err != io.EOF {
 			req.handleFrostFSErr(err, start)

internal/handler/reader.go

@@ -55,14 +55,14 @@ func (h *Handler) receiveFile(ctx context.Context, req request, objectAddress oi
 		filename string
 	)
 
-	prm := PrmObjectGet{
+	prm := PrmObjectRead{
 		PrmAuth: PrmAuth{
 			BearerToken: bearerToken(ctx),
 		},
 		Address: objectAddress,
 	}
 
-	rObj, err := h.frostfs.GetObject(ctx, prm)
+	rObj, err := h.frostfs.ReadObject(ctx, prm)
 	if err != nil {
 		req.handleFrostFSErr(err, start)
 		return
@@ -74,11 +74,11 @@ func (h *Handler) receiveFile(ctx context.Context, req request, objectAddress oi
 		dis = "attachment"
 	}
 
-	payloadSize := rObj.Header.PayloadSize()
+	payloadSize := rObj.Head.PayloadSize()
 
 	req.Response.Header.Set(fasthttp.HeaderContentLength, strconv.FormatUint(payloadSize, 10))
 	var contentType string
-	for _, attr := range rObj.Header.Attributes() {
+	for _, attr := range rObj.Head.Attributes() {
 		key := attr.Key()
 		val := attr.Value()
 		if !isValidToken(key) || !isValidValue(val) {
@@ -107,7 +107,7 @@ func (h *Handler) receiveFile(ctx context.Context, req request, objectAddress oi
 		}
 	}
 
-	idsToResponse(&req.Response, &rObj.Header)
+	idsToResponse(&req.Response, rObj.Head)
 
 	if len(contentType) == 0 {
 		// determine the Content-Type from the payload head