From 574f24a85c5dfb55595006b6775edfad6db27ee7 Mon Sep 17 00:00:00 2001 From: Pavel Pogodaev Date: Fri, 24 Jan 2025 12:41:07 +0300 Subject: [PATCH] [#51] add address to logs Signed-off-by: Pavel Pogodaev --- pool/object_put_pool_transformer.go | 7 ++++--- pool/pool.go | 32 +++++++++++++++++++++++------ pool/tree/pool.go | 6 +++--- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/pool/object_put_pool_transformer.go b/pool/object_put_pool_transformer.go index e596aeb3..43565c72 100644 --- a/pool/object_put_pool_transformer.go +++ b/pool/object_put_pool_transformer.go @@ -2,6 +2,7 @@ package pool import ( "context" + "fmt" sdkClient "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" @@ -134,7 +135,7 @@ func (it *internalTarget) putAsStream(ctx context.Context, o *object.Object) err it.res.OID = res.StoredObjectID() it.res.Epoch = res.StoredEpoch() } - return err + return fmt.Errorf("put as stream '%s': %w", it.address, err) } func (it *internalTarget) tryPutSingle(ctx context.Context, o *object.Object) (bool, error) { @@ -151,7 +152,7 @@ func (it *internalTarget) tryPutSingle(ctx context.Context, o *object.Object) (b res, err := it.client.ObjectPutSingle(ctx, cliPrm) if err != nil && status.Code(err) == codes.Unimplemented { - return false, err + return false, fmt.Errorf("try put single '%s': %w", it.address, err) } if err == nil { @@ -166,5 +167,5 @@ func (it *internalTarget) tryPutSingle(ctx context.Context, o *object.Object) (b } return true, nil } - return true, err + return true, fmt.Errorf("try put single '%s': %w", it.address, err) } diff --git a/pool/pool.go b/pool/pool.go index 1f695773..9c788400 100644 --- a/pool/pool.go +++ b/pool/pool.go @@ -2769,7 +2769,7 @@ func (p *Pool) HeadObject(ctx context.Context, prm PrmObjectHead) (object.Object err := p.initCallContext(&cc, prm.prmCommon, prmContext{}) if err != nil { - return obj, err + return obj, fmt.Errorf("head object via client %s: %w", cc.endpoint, err) } return obj, p.call(ctx, &cc, func() error { @@ -3197,6 +3197,10 @@ func (p *Pool) GetSplitInfo(ctx context.Context, cnrID cid.ID, objID oid.ID, tok var addr oid.Address addr.SetContainer(cnrID) addr.SetObject(objID) + cp, err := p.connection() + if err != nil { + return nil, err + } var prm PrmObjectHead prm.SetAddress(addr) @@ -3208,7 +3212,7 @@ func (p *Pool) GetSplitInfo(ctx context.Context, cnrID cid.ID, objID oid.ID, tok } prm.MarkRaw() - _, err := p.HeadObject(ctx, prm) + _, err = p.HeadObject(ctx, prm) var errSplit *object.SplitInfoError var errECInfo *object.ECInfoError @@ -3217,7 +3221,7 @@ func (p *Pool) GetSplitInfo(ctx context.Context, cnrID cid.ID, objID oid.ID, tok case errors.As(err, &errSplit): return errSplit.SplitInfo(), nil case err == nil || errors.As(err, &errECInfo): - return nil, relations.ErrNoSplitInfo + return nil, fmt.Errorf("failed to get raw object header via client %s %w", cp.address(), relations.ErrNoSplitInfo) default: return nil, fmt.Errorf("failed to get raw object header: %w", err) } @@ -3228,6 +3232,10 @@ func (p *Pool) ListChildrenByLinker(ctx context.Context, cnrID cid.ID, objID oid var addr oid.Address addr.SetContainer(cnrID) addr.SetObject(objID) + cp, err := p.connection() + if err != nil { + return nil, err + } var prm PrmObjectHead prm.SetAddress(addr) @@ -3251,6 +3259,10 @@ func (p *Pool) GetLeftSibling(ctx context.Context, cnrID cid.ID, objID oid.ID, t var addr oid.Address addr.SetContainer(cnrID) addr.SetObject(objID) + cp, err := p.connection() + if err != nil { + return oid.ID{}, err + } var prm PrmObjectHead prm.SetAddress(addr) @@ -3268,7 +3280,7 @@ func (p *Pool) GetLeftSibling(ctx context.Context, cnrID cid.ID, objID oid.ID, t idMember, ok := res.PreviousID() if !ok { - return oid.ID{}, relations.ErrNoLeftSibling + return oid.ID{}, fmt.Errorf("failed to get sibling via client %s %w", cp.address(), relations.ErrNoLeftSibling) } return idMember, nil } @@ -3287,6 +3299,10 @@ func (p *Pool) FindSiblingBySplitID(ctx context.Context, cnrID cid.ID, splitID * if tokens.Session != nil { prm.UseSession(*tokens.Session) } + cp, err := p.connection() + if err != nil { + return nil, err + } res, err := p.SearchObjects(ctx, prm) if err != nil { @@ -3299,7 +3315,7 @@ func (p *Pool) FindSiblingBySplitID(ctx context.Context, cnrID cid.ID, splitID * return false }) if err != nil { - return nil, fmt.Errorf("failed to iterate found objects: %w", err) + return nil, fmt.Errorf("failed to iterate found objects by addr %s: %w", cp.address(), err) } return members, nil @@ -3319,6 +3335,10 @@ func (p *Pool) FindSiblingByParentID(ctx context.Context, cnrID cid.ID, objID oi if tokens.Session != nil { prm.UseSession(*tokens.Session) } + cp, err := p.connection() + if err != nil { + return nil, err + } resSearch, err := p.SearchObjects(ctx, prm) if err != nil { @@ -3331,7 +3351,7 @@ func (p *Pool) FindSiblingByParentID(ctx context.Context, cnrID cid.ID, objID oi return false }) if err != nil { - return nil, fmt.Errorf("failed to iterate found objects: %w", err) + return nil, fmt.Errorf("failed to iterate found objects by addr %s: %w", cp.address(), err) } return res, nil diff --git a/pool/tree/pool.go b/pool/tree/pool.go index ab6e98a1..587cd863 100644 --- a/pool/tree/pool.go +++ b/pool/tree/pool.go @@ -657,7 +657,7 @@ func (p *Pool) Close() error { for _, group := range p.innerPools { for _, cl := range group.clients { if closeErr := cl.close(); closeErr != nil { - p.log(zapcore.ErrorLevel, "close client connection", zap.Error(closeErr)) + p.log(zapcore.ErrorLevel, "close client connection", zap.Error(closeErr), zap.String("addr", cl.endpoint())) err = closeErr } } @@ -676,7 +676,7 @@ func (p *Pool) closeClientMapConnections() (err error) { for _, cl := range p.clientMap { if closeErr := cl.close(); closeErr != nil { - p.log(zapcore.ErrorLevel, "close client connection", zap.Error(closeErr)) + p.log(zapcore.ErrorLevel, "close client connection", zap.Error(closeErr), zap.String("addr", cl.endpoint())) err = closeErr } } @@ -962,7 +962,7 @@ LOOP: treeCl, err = p.getNewTreeClient(ctx, cnrNode) if err != nil { finErr = finalError(finErr, err) - p.log(zap.DebugLevel, "failed to create tree client", zap.String("request_id", reqID), zap.Int("remaining attempts", attempts)) + p.log(zap.DebugLevel, "failed to create tree client", zap.String("request_id", reqID), zap.Int("remaining attempts", attempts), zap.String("addr", treeCl.endpoint())) continue }