Skip to content

object server: resolve log error TODOs for remote node operations #4142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roman-khimov merged 3 commits into from
Aug 26, 2026
Merged

object server: resolve log error TODOs for remote node operations #4142

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f572fa2
Initial plan
Copilot Aug 25, 2026
1be5ce8
object server: add warn logging for remote node errors
Copilot Aug 25, 2026
9292593
object server: change remote node failure log level from Warn to Debug
Copilot Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions pkg/services/object/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ type putStream struct {
ctx context.Context
signer ecdsa.PrivateKey
base *putsvc.Streamer
log *zap.Logger

cacheReqs bool
initReq *protoobject.PutRequest
Expand All @@ -289,17 +290,22 @@ type putStream struct {
expBytes, recvBytes uint64 // payload
}

func newIntermediatePutStream(signer ecdsa.PrivateKey, base *putsvc.Streamer, ctx context.Context) *putStream {
func newIntermediatePutStream(signer ecdsa.PrivateKey, base *putsvc.Streamer, ctx context.Context, log *zap.Logger) *putStream {
return &putStream{
ctx: ctx,
signer: signer,
base: base,
log: log,
}
}

func (x *putStream) sendToRemoteNode(c clientcore.MultiAddressClient) error {
return c.ForAnyGRPCConn(x.ctx, func(ctx context.Context, conn *grpc.ClientConn) error {
return putToRemoteNode(ctx, conn, x.initReq, x.chunkReqs) // TODO: log error
err := putToRemoteNode(ctx, conn, x.initReq, x.chunkReqs)
if err != nil {
x.log.Debug("failed to put object to remote node", zap.Error(err))
}
return err
})
}

Expand Down Expand Up @@ -411,7 +417,7 @@ func (s *Server) Put(gStream protoobject.ObjectService_PutServer) error {
var req, reqFirst *protoobject.PutRequest
var resp *protoobject.PutResponse

ps := newIntermediatePutStream(s.signer, stream, ctx)
ps := newIntermediatePutStream(s.signer, stream, ctx, s.log)
for {
if req, err = gStream.Recv(); err != nil {
if errors.Is(err, io.EOF) {
Expand Down Expand Up @@ -696,7 +702,7 @@ func (s *Server) HeadBuffered(ctx context.Context, req *protoobject.HeadRequest)
}

var resp protoobject.HeadResponse
p, err := convertHeadPrm(s.signer, reqInfo.Container, req, &resp, cnrID, objID, reqMD)
p, err := convertHeadPrm(s.signer, reqInfo.Container, req, &resp, cnrID, objID, reqMD, s.log)
if err != nil {
if !errors.Is(err, apistatus.Error) {
err = newBadRequestError(err.Error()) // defer
Expand Down Expand Up @@ -811,7 +817,7 @@ func (x *headResponse) WriteHeader(hdr *object.Object) error {

// converts original request into parameters accepted by the internal handler.
// Note that the response is untouched within this call.
func convertHeadPrm(signer ecdsa.PrivateKey, cnr container.Container, req *protoobject.HeadRequest, resp *protoobject.HeadResponse, cnrID cid.ID, objID oid.ID, reqMD requestMetadata) (getsvc.HeadPrm, error) {
func convertHeadPrm(signer ecdsa.PrivateKey, cnr container.Container, req *protoobject.HeadRequest, resp *protoobject.HeadResponse, cnrID cid.ID, objID oid.ID, reqMD requestMetadata, log *zap.Logger) (getsvc.HeadPrm, error) {
cp := objutil.CommonPrmFromRequest(reqMD.ttl, reqMD.xHeaders, reqMD.tokens)

var p getsvc.HeadPrm
Expand Down Expand Up @@ -857,7 +863,10 @@ func convertHeadPrm(signer ecdsa.PrivateKey, cnr container.Container, req *proto
return respBuf, hdr, c.ForAnyGRPCConn(ctx, func(ctx context.Context, conn *grpc.ClientConn) error {
var err error
respBuf, hdr, err = getHeaderFromRemoteNode(ctx, conn, req, objID)
return err // TODO: log error
if err != nil {
log.Debug("failed to get object header from remote node", zap.Error(err))
}
return err
})
})
return p, nil
Expand Down Expand Up @@ -1065,7 +1074,7 @@ func (s *Server) Get(req *protoobject.GetRequest, gStream protoobject.ObjectServ
payloadOnly: req.GetBody().GetPayloadOnly(),
returnVersionInResponse: util.NeedVersionInResponse(req.MetaHeader),
sendECPartIndInResponse: sendECPartIdxInResponse(req),
}, cnrID, objID, reqMD)
}, cnrID, objID, reqMD, s.log)
if err != nil {
if !errors.Is(err, apistatus.Error) {
err = newBadRequestError(err.Error()) // defer
Expand Down Expand Up @@ -1336,7 +1345,7 @@ func (s *Server) copyGetStream(gStream grpc.ServerStream, hdrRespBuf *iprotobuf.
// converts original request into parameters accepted by the internal handler.
// Note that the stream is untouched within this call, errors are not reported
// into it.
func convertGetPrm(signer ecdsa.PrivateKey, cnr container.Container, req *protoobject.GetRequest, stream *getStream, cnrID cid.ID, objID oid.ID, reqMD requestMetadata) (getsvc.Prm, error) {
func convertGetPrm(signer ecdsa.PrivateKey, cnr container.Container, req *protoobject.GetRequest, stream *getStream, cnrID cid.ID, objID oid.ID, reqMD requestMetadata, log *zap.Logger) (getsvc.Prm, error) {
body := req.GetBody()

rng := body.GetRange()
Expand Down Expand Up @@ -1437,7 +1446,11 @@ func convertGetPrm(signer ecdsa.PrivateKey, cnr container.Container, req *protoo
}

return c.ForAnyGRPCConn(ctx, func(ctx context.Context, conn *grpc.ClientConn) error {
return proxyCtx.continueWithConn(ctx, req, conn) // TODO: log error
err := proxyCtx.continueWithConn(ctx, req, conn)
if err != nil {
log.Debug("failed to get object from remote node", zap.Error(err))
}
return err
})
})
return p, nil
Expand Down Expand Up @@ -2236,7 +2249,10 @@ func (s *Server) searchOnRemoteNode(ctx context.Context, node netmap.NodeInfo, r
return items, more, c.ForAnyGRPCConn(ctx, func(ctx context.Context, conn *grpc.ClientConn) error {
var err error
items, more, err = searchOnRemoteAddress(ctx, conn, outReq)
return err // TODO: log error
if err != nil {
s.log.Debug("failed to search objects on remote node", zap.Error(err))
}
return err
})
}

Expand Down
Loading