Skip to content

Commit 5921b2c

Browse files
committed
api/v3rpc: log grpc stream send/recv errors in server-side
Signed-off-by: Gyu-Ho Lee <[email protected]>
1 parent a19672b commit 5921b2c

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

etcdserver/api/v3rpc/lease.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ func (ls *LeaseServer) leaseKeepAlive(stream pb.Lease_LeaseKeepAliveServer) erro
9292
return nil
9393
}
9494
if err != nil {
95+
plog.Warningf("failed to receive lease keepalive request from gRPC stream (%q)", err.Error())
9596
return err
9697
}
9798

@@ -117,6 +118,7 @@ func (ls *LeaseServer) leaseKeepAlive(stream pb.Lease_LeaseKeepAliveServer) erro
117118
resp.TTL = ttl
118119
err = stream.Send(resp)
119120
if err != nil {
121+
plog.Warningf("failed to send lease keepalive response to gRPC stream (%q)", err.Error())
120122
return err
121123
}
122124
}

etcdserver/api/v3rpc/watch.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) (err error) {
141141
// deadlock when calling sws.close().
142142
go func() {
143143
if rerr := sws.recvLoop(); rerr != nil {
144+
plog.Warningf("failed to receive watch request from gRPC stream (%q)", rerr.Error())
144145
errc <- rerr
145146
}
146147
}()
@@ -337,6 +338,7 @@ func (sws *serverWatchStream) sendLoop() {
337338

338339
mvcc.ReportEventReceived(len(evs))
339340
if err := sws.gRPCStream.Send(wr); err != nil {
341+
plog.Warningf("failed to send watch response to gRPC stream (%q)", err.Error())
340342
return
341343
}
342344

@@ -353,6 +355,7 @@ func (sws *serverWatchStream) sendLoop() {
353355
}
354356

355357
if err := sws.gRPCStream.Send(c); err != nil {
358+
plog.Warningf("failed to send watch control response to gRPC stream (%q)", err.Error())
356359
return
357360
}
358361

@@ -368,6 +371,7 @@ func (sws *serverWatchStream) sendLoop() {
368371
for _, v := range pending[wid] {
369372
mvcc.ReportEventReceived(len(v.Events))
370373
if err := sws.gRPCStream.Send(v); err != nil {
374+
plog.Warningf("failed to send pending watch response to gRPC stream (%q)", err.Error())
371375
return
372376
}
373377
}

0 commit comments

Comments
 (0)