From 2fa9dd14e09c553faf7b236e5eea0979951a94e9 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Tue, 24 Jun 2025 00:08:20 +0000 Subject: [PATCH 1/3] Stopping logging error when the connection no longer exists --- pkg/agent/client.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/agent/client.go b/pkg/agent/client.go index e54e1abf8..ead5b38c7 100644 --- a/pkg/agent/client.go +++ b/pkg/agent/client.go @@ -354,7 +354,13 @@ func (a *Client) Serve() { if status.Code(err) == codes.Canceled { klog.V(2).InfoS("stream canceled", "serverID", a.serverID, "agentID", a.agentID) } else { - klog.ErrorS(err, "could not read stream", "serverID", a.serverID, "agentID", a.agentID) + select { + case <-a.stopCh: + klog.V(5).InfoS("could not read stream because agent client is shutting down", "err", err) + default: + // If stopCh is not closed, this is a legitimate, unexpected error. + klog.ErrorS(err, "could not read stream", "serverID", a.serverID, "agentID", a.agentID) + } } return } @@ -407,7 +413,13 @@ func (a *Client) Serve() { closePkt.GetCloseResponse().ConnectID = connID } if err := a.Send(closePkt); err != nil { - klog.ErrorS(err, "close response failure", "") + if err == io.EOF { + klog.V(2).InfoS("received EOF; connection already closed", "connectionID", connID, "err", err) + } else if _, ok := a.connManager.Get(connID); !ok { + klog.V(5).InfoS("connection already closed", "connectionID", connID, "err", err) + } else { + klog.ErrorS(err, "close response failure", "") + } } close(dataCh) a.connManager.Delete(connID) From 349434131453b27b96f9579ffc5273ed2c13d0f1 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Tue, 24 Jun 2025 18:47:04 +0000 Subject: [PATCH 2/3] Address comments --- pkg/agent/client.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/agent/client.go b/pkg/agent/client.go index ead5b38c7..6c606051f 100644 --- a/pkg/agent/client.go +++ b/pkg/agent/client.go @@ -356,7 +356,7 @@ func (a *Client) Serve() { } else { select { case <-a.stopCh: - klog.V(5).InfoS("could not read stream because agent client is shutting down", "err", err) + klog.V(5).InfoS("could not read stream because agent client is shutting down", "serverID", a.serverID, "agentID", a.agentID, "err", err) default: // If stopCh is not closed, this is a legitimate, unexpected error. klog.ErrorS(err, "could not read stream", "serverID", a.serverID, "agentID", a.agentID) @@ -414,11 +414,11 @@ func (a *Client) Serve() { } if err := a.Send(closePkt); err != nil { if err == io.EOF { - klog.V(2).InfoS("received EOF; connection already closed", "connectionID", connID, "err", err) + klog.V(2).InfoS("received EOF; connection already closed", "connectionID", connID, "dialID", dialReq.Random, "err", err) } else if _, ok := a.connManager.Get(connID); !ok { - klog.V(5).InfoS("connection already closed", "connectionID", connID, "err", err) + klog.V(5).InfoS("connection already closed", "connectionID", connID, "dialID", dialReq.Random, "err", err) } else { - klog.ErrorS(err, "close response failure", "") + klog.ErrorS(err, "close response failure", "connectionID", connID, "dialID", dialReq.Random) } } close(dataCh) From c35d18010fe9e45dd8e46385c5fe7ed19e375002 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Wed, 25 Jun 2025 21:00:37 +0000 Subject: [PATCH 3/3] Fix log level --- pkg/agent/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/agent/client.go b/pkg/agent/client.go index 6c606051f..e86cb9b32 100644 --- a/pkg/agent/client.go +++ b/pkg/agent/client.go @@ -414,7 +414,7 @@ func (a *Client) Serve() { } if err := a.Send(closePkt); err != nil { if err == io.EOF { - klog.V(2).InfoS("received EOF; connection already closed", "connectionID", connID, "dialID", dialReq.Random, "err", err) + klog.V(4).InfoS("received EOF; connection already closed", "connectionID", connID, "dialID", dialReq.Random, "err", err) } else if _, ok := a.connManager.Get(connID); !ok { klog.V(5).InfoS("connection already closed", "connectionID", connID, "dialID", dialReq.Random, "err", err) } else {