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

client: move lock so MembersAPI.List doesn't deadlock

Browse Source
This commit is contained in:
Brian Waldon 2015-01-29 16:12:34 -08:00 committed by Yicheng Qin
parent 83930ac113
commit ae062a0825
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/client.go
View File

@ -223,15 +223,15 @@ func (c *httpClusterClient) Endpoints() []string {
} }
func (c *httpClusterClient) Sync(ctx context.Context) error { func (c *httpClusterClient) Sync(ctx context.Context) error {
c.Lock()
defer c.Unlock()
mAPI := NewMembersAPI(c) mAPI := NewMembersAPI(c)
ms, err := mAPI.List(ctx) ms, err := mAPI.List(ctx)
if err != nil { if err != nil {
return err return err
} }
c.Lock()
defer c.Unlock()
eps := make([]string, 0) eps := make([]string, 0)
for _, m := range ms { for _, m := range ms {
eps = append(eps, m.ClientURLs...) eps = append(eps, m.ClientURLs...)