Skip to content

Commit a38752d

Browse files
authored
Merge pull request #494 from jkh52/server-logs
Quiet more error logs on stream canceled.
2 parents fd446dc + 4a1ebcb commit a38752d

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pkg/agent/client.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ import (
3030

3131
"google.golang.org/grpc"
3232
"google.golang.org/grpc/connectivity"
33+
"google.golang.org/grpc/codes"
3334
"google.golang.org/grpc/metadata"
35+
"google.golang.org/grpc/status"
3436
"k8s.io/klog/v2"
3537

3638
commonmetrics "sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics"
@@ -332,7 +334,11 @@ func (a *Client) Serve() {
332334
klog.V(2).InfoS("received EOF, exit", "serverID", a.serverID, "agentID", a.agentID)
333335
return
334336
}
335-
klog.ErrorS(err, "could not read stream", "serverID", a.serverID, "agentID", a.agentID)
337+
if status.Code(err) == codes.Canceled {
338+
klog.V(2).InfoS("stream canceled", "serverID", a.serverID, "agentID", a.agentID)
339+
} else {
340+
klog.ErrorS(err, "could not read stream", "serverID", a.serverID, "agentID", a.agentID)
341+
}
336342
return
337343
}
338344

pkg/server/server.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,11 @@ func (s *ProxyServer) readBackendToChannel(backend Backend, recvCh chan *client.
858858
return
859859
}
860860
if err != nil {
861-
klog.ErrorS(err, "Receive stream from agent read failure")
861+
if status.Code(err) == codes.Canceled {
862+
klog.V(2).InfoS("Stream read from agent cancelled", "agentID", agentID)
863+
} else {
864+
klog.ErrorS(err, "Receive stream from agent read failure", "agentID", agentID)
865+
}
862866
stopCh <- err
863867
close(stopCh)
864868
return

0 commit comments

Comments
 (0)