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

Merge pull request #5026 from lodevil/master

Browse Source 
KeepAliveOnce error fix (when the lease not found)
This commit is contained in:
Gyu-Ho Lee 2016-04-10 17:35:52 -07:00
commit 0d9039f192
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clientv3/integration/lease_test.go
View File

@ -23,6 +23,8 @@ import (
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
)
func TestLeaseGrant(t *testing.T) {
@ -92,6 +94,11 @@ func TestLeaseKeepAliveOnce(t *testing.T) {
if err != nil {
t.Errorf("failed to keepalive lease %v", err)
}
_, err = lapi.KeepAliveOnce(context.Background(), clientv3.LeaseID(0))
if grpc.Code(err) != codes.NotFound {
t.Errorf("invalid error returned %v", err)
}
}
func TestLeaseKeepAlive(t *testing.T) {

3
clientv3/lease.go
View File

@ -181,6 +181,9 @@ func (l *lessor) KeepAliveOnce(ctx context.Context, id LeaseID) (*LeaseKeepAlive
if err == nil {
return resp, err
}
if isHalted(ctx, err) {
return resp, err
}
nerr := l.switchRemoteAndStream(err)
if nerr != nil {