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 #6540 from fanminshi/lease_panic_fix

Browse Source 
etcdserver: fix a node panic bug caused LeaseTimeToLive call on a nonexistent lease
This commit is contained in:
Xiang Li
2016-09-27 23:17:16 -05:00
committed by GitHub
parent e68cd086ee 8ef6687018
commit eee23eaf43
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etcdserver/v3_server.go
View File

@@ -308,17 +308,15 @@ func (s *EtcdServer) LeaseTimeToLive(ctx context.Context, r *pb.LeaseTimeToLiveR
return nil, err
}
var lresp *pb.LeaseTimeToLiveResponse
for _, url := range leader.PeerURLs {
lurl := url + leasehttp.LeaseInternalPrefix
var iresp *leasepb.LeaseInternalResponse
iresp, err = leasehttp.TimeToLiveHTTP(ctx, lease.LeaseID(r.ID), r.Keys, lurl, s.peerRt)
if err == nil {
lresp = iresp.LeaseTimeToLiveResponse
break
return iresp.LeaseTimeToLiveResponse, nil
}
}
return lresp, nil
return nil, err
}
func (s *EtcdServer) waitLeader() (*membership.Member, error) {

26
integration/v3_lease_test.go
View File

@@ -243,7 +243,31 @@ func TestV3PutOnNonExistLease(t *testing.T) {
putr := &pb.PutRequest{Key: []byte("foo"), Value: []byte("bar"), Lease: badLeaseID}
_, err := toGRPC(clus.RandClient()).KV.Put(ctx, putr)
if !eqErrGRPC(err, rpctypes.ErrGRPCLeaseNotFound) {
t.Errorf("err = %v, want %v", err, rpctypes.ErrGRPCCompacted)
t.Errorf("err = %v, want %v", err, rpctypes.ErrGRPCLeaseNotFound)
}
}
// TestV3GetNonExistLease tests the case where the non exist lease is report as lease not found error using LeaseTimeToLive()
// A bug was found when a non leader etcd server returns nil instead of lease not found error which caues the server to crash.
// related issue https://github.com/coreos/etcd/issues/6537
func TestV3GetNonExistLease(t *testing.T) {
defer testutil.AfterTest(t)
clus := NewClusterV3(t, &ClusterConfig{Size: 3})
defer clus.Terminate(t)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
leaseTTLr := &pb.LeaseTimeToLiveRequest{
ID: 123,
Keys: true,
}
for _, client := range clus.clients {
_, err := toGRPC(client).Lease.LeaseTimeToLive(ctx, leaseTTLr)
if !eqErrGRPC(err, rpctypes.ErrGRPCLeaseNotFound) {
t.Errorf("err = %v, want %v", err, rpctypes.ErrGRPCLeaseNotFound)
}
}
}