Skip to content

Commit

Permalink
integration: test 'inflight' range requests
Browse files Browse the repository at this point in the history
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
  • Loading branch information
gyuho committed Apr 14, 2017
1 parent 4fbca50 commit 6686634
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
5 changes: 5 additions & 0 deletions integration/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,11 @@ func mustNewMember(t *testing.T, mcfg memberConfig) *member {
m.TickMs = uint(tickDuration / time.Millisecond)
m.QuotaBackendBytes = mcfg.quotaBackendBytes
m.AuthToken = "simple" // for the purpose of integration testing, simple token is enough
m.ServerConfig.OnShutdown = func() {
if m.grpcServer != nil {
m.grpcServer.GracefulStop()
}
}
return m
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
package integration

import (
"sync"
"testing"
"time"

"google.golang.org/grpc"

pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/testutil"

"golang.org/x/net/context"
"google.golang.org/grpc"
)

// TestV3MaintenanceHashInflight ensures inflight Hash call
Expand Down Expand Up @@ -75,3 +76,38 @@ func TestV3MaintenanceDefragmentInflightRange(t *testing.T) {

<-donec
}

// TestV3KVInflightRangeRequests ensures that inflight requests before shutdown can finish
// when gRPC server gracefully shuts down.
func TestV3KVInflightRangeRequests(t *testing.T) {
defer testutil.AfterTest(t)
clus := NewClusterV3(t, &ClusterConfig{Size: 1})
defer clus.Terminate(t)

cli := clus.RandClient()
kvc := toGRPC(cli).KV

if _, err := kvc.Put(context.Background(), &pb.PutRequest{Key: []byte("foo"), Value: []byte("bar")}); err != nil {
panic(err)
}

ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)

reqN := 10 // use 500+ for fast machine
var wg sync.WaitGroup
wg.Add(reqN)
for i := 0; i < reqN; i++ {
go func() {
defer wg.Done()
_, err := kvc.Range(ctx, &pb.RangeRequest{Key: []byte("foo"), Serializable: true}, grpc.FailFast(false))
if err != nil && grpc.ErrorDesc(err) != context.Canceled.Error() {
t.Fatal(err)
}
}()
}

clus.Members[0].s.HardStop()
cancel()

wg.Wait()
}

0 comments on commit 6686634

Please sign in to comment.