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

etcd-tester: close gRPC connection when canceling

Browse Source 
Currently gRPC connection just gets recreated
for every Stress call. When Stress ends or gets
canceled, gRPC connection must also be closed.

For https://github.com/coreos/etcd/issues/4464.
This commit is contained in:
Gyu-Ho Lee 2016-02-09 09:43:06 -08:00
parent fa71bec550
commit a46e20f92a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/functional-tester/etcd-tester/stresser.go
View File

@ -57,6 +57,7 @@ type stresser struct {
success int success int
cancel func() cancel func()
conn *grpc.ClientConn
} }
func (s *stresser) Stress() error { func (s *stresser) Stress() error {
@ -64,10 +65,14 @@ func (s *stresser) Stress() error {
if err != nil { if err != nil {
return fmt.Errorf("%v (%s)", err, s.Endpoint) return fmt.Errorf("%v (%s)", err, s.Endpoint)
} }
kvc := pb.NewKVClient(conn)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
s.mu.Lock()
s.conn = conn
s.cancel = cancel s.cancel = cancel
s.mu.Unlock()
kvc := pb.NewKVClient(conn)
for i := 0; i < s.N; i++ { for i := 0; i < s.N; i++ {
go func(i int) { go func(i int) {
@ -97,7 +102,12 @@ func (s *stresser) Stress() error {
} }
func (s *stresser) Cancel() { func (s *stresser) Cancel() {
s.cancel() s.mu.Lock()
cancel, conn := s.cancel, s.conn
s.mu.Unlock()
cancel()
// TODO: wait for all routines to exit by adding a waitGroup before calling conn.Close()
conn.Close()
} }
func (s *stresser) Report() (success int, failure int) { func (s *stresser) Report() (success int, failure int) {