Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientv3: close streams after use in lessor keepAliveOnce method

Browse Source 
Streams are now closed after being used in the lessor `keepAliveOnce` method.
This prevents the "failed to receive lease keepalive request from gRPC stream"
message from being logged by the server after the context is cancelled by the
client.

Signed-off-by: Justin Kolberg <amd.prophet@gmail.com>
This commit is contained in:
Justin Kolberg 2022-08-17 12:51:45 -07:00
parent ba0c7c31a7
commit 295044fba2
No known key found for this signature in database
GPG Key ID: 42E9E13080BB3F2B
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/v3/lease.go
View File

@ -397,7 +397,7 @@ func (l *lessor) closeRequireLeader() {
} }
} }
func (l *lessor) keepAliveOnce(ctx context.Context, id LeaseID) (*LeaseKeepAliveResponse, error) { func (l *lessor) keepAliveOnce(ctx context.Context, id LeaseID) (karesp *LeaseKeepAliveResponse, ferr error) {
cctx, cancel := context.WithCancel(ctx) cctx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
@ -406,6 +406,15 @@ func (l *lessor) keepAliveOnce(ctx context.Context, id LeaseID) (*LeaseKeepAlive
return nil, toErr(ctx, err) return nil, toErr(ctx, err)
} }
defer func() {
if err := stream.CloseSend(); err != nil {
if ferr == nil {
ferr = toErr(ctx, err)
}
return
}
}()
err = stream.Send(&pb.LeaseKeepAliveRequest{ID: int64(id)}) err = stream.Send(&pb.LeaseKeepAliveRequest{ID: int64(id)})
if err != nil { if err != nil {
return nil, toErr(ctx, err) return nil, toErr(ctx, err)
@ -416,7 +425,7 @@ func (l *lessor) keepAliveOnce(ctx context.Context, id LeaseID) (*LeaseKeepAlive
return nil, toErr(ctx, rerr) return nil, toErr(ctx, rerr)
} }
karesp := &LeaseKeepAliveResponse{ karesp = &LeaseKeepAliveResponse{
ResponseHeader: resp.GetHeader(), ResponseHeader: resp.GetHeader(),
ID: LeaseID(resp.ID), ID: LeaseID(resp.ID),
TTL: resp.TTL, TTL: resp.TTL,