Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clientv3: fix balancer/retry #8710

Closed
wants to merge 17 commits into from
Closed

clientv3: fix balancer/retry #8710

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4818f23
words: whitelist more
gyuho Oct 13, 2017
1a12a64
vendor/grpc-go: cherry-pick WriteStatus fix from v1.7.0
gyuho Oct 15, 2017
bc45227
glide: add note to grpc version
gyuho Oct 15, 2017
a03f0d1
clientv3/health: handle stale endpoints, rename to 'unhealthyHosts'
gyuho Oct 16, 2017
5351ae2
clientv3: clean up logging, variable names
gyuho Oct 14, 2017
26291ab
clientv3/balancer: fix retry logic
gyuho Oct 18, 2017
8fac498
clientv3: remove redundant retries in KV, set FailFast=true
gyuho Oct 18, 2017
d13827f
clientv3: remove redundant retries in Watch, set FailFast=true
gyuho Oct 18, 2017
f90a0b6
clientv3: remove redundant retries in Lease, set FailFast=true
gyuho Oct 18, 2017
d79e655
clientv3: remove redundant retries in Cluster, set FailFast=true
gyuho Oct 18, 2017
ff1b2cd
clientv3: remove redundant retries in Maintenance, set FailFast=true
gyuho Oct 18, 2017
4e0b52d
clientv3: remove redundant retries in Auth, set FailFast=true
gyuho Oct 18, 2017
140cb0c
clientv3/integration: match grpc.ErrClientConnClosing in TestKVNewAft…
gyuho Oct 16, 2017
5bdbcba
clientv3/integration: match ErrTimeout in testNetworkPartitionBalancer
gyuho Oct 17, 2017
1ee5f32
clientv3/integration: match errors in leasing tests
gyuho Oct 18, 2017
1e217ef
clientv3/integration: increase time-out for endpoint switch in TestKV…
gyuho Oct 18, 2017
7c9cf81
clientv3/integration: increase timeout in watch connection close tests
gyuho Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions clientv3/integration/leasing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"math/rand"
"reflect"
"strings"
"sync"
"testing"
"time"
Expand All @@ -28,6 +29,8 @@ import (
"github.com/coreos/etcd/clientv3/leasing"
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"

"google.golang.org/grpc/transport"
)

func TestLeasingPutGet(t *testing.T) {
Expand Down Expand Up @@ -1083,8 +1086,8 @@ func TestLeasingOwnerPutError(t *testing.T) {
clus.Members[0].Stop(t)
ctx, cancel := context.WithTimeout(context.TODO(), 100*time.Millisecond)
defer cancel()
if resp, err := lkv.Put(ctx, "k", "v"); err == nil {
t.Fatalf("expected error, got response %+v", resp)
if resp, err := lkv.Put(ctx, "k", "v"); err != context.DeadlineExceeded && !strings.Contains(err.Error(), "transport is closing") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rpc call should only return context type or status type error.

t.Fatalf("expected %v or %v, got %v, response %+v", context.DeadlineExceeded, transport.ErrConnClosing, err, resp)
}
}

Expand All @@ -1104,8 +1107,8 @@ func TestLeasingOwnerDeleteError(t *testing.T) {
clus.Members[0].Stop(t)
ctx, cancel := context.WithTimeout(context.TODO(), 100*time.Millisecond)
defer cancel()
if resp, err := lkv.Delete(ctx, "k"); err == nil {
t.Fatalf("expected error, got response %+v", resp)
if resp, err := lkv.Delete(ctx, "k"); err != context.DeadlineExceeded && !strings.Contains(err.Error(), "transport is closing") {
t.Fatalf("expected %v or %v, got %v, response %+v", context.DeadlineExceeded, transport.ErrConnClosing, err, resp)
}
}

Expand All @@ -1121,8 +1124,8 @@ func TestLeasingNonOwnerPutError(t *testing.T) {
clus.Members[0].Stop(t)
ctx, cancel := context.WithTimeout(context.TODO(), 100*time.Millisecond)
defer cancel()
if resp, err := lkv.Put(ctx, "k", "v"); err == nil {
t.Fatalf("expected error, got response %+v", resp)
if resp, err := lkv.Put(ctx, "k", "v"); err != context.DeadlineExceeded && !strings.Contains(err.Error(), "transport is closing") {
t.Fatalf("expected %v or %v, got %v, response %+v", context.DeadlineExceeded, transport.ErrConnClosing, err, resp)
}
}

Expand Down