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: protect httpClusterClient with RWMutex

Browse Source
This commit is contained in:
Brian Waldon 2015-01-26 15:25:19 -08:00 committed by Yicheng Qin
parent 0943831b8e
commit 99d63eb62e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/http.go
View File

@ -20,6 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"sync"
"time" "time"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
@ -78,6 +79,7 @@ type httpClusterClient struct {
transport CancelableTransport transport CancelableTransport
endpoints []string endpoints []string
clients []HTTPClient clients []HTTPClient
sync.RWMutex
} }
func (c *httpClusterClient) reset(tr CancelableTransport, eps []string) error { func (c *httpClusterClient) reset(tr CancelableTransport, eps []string) error {
@ -111,6 +113,9 @@ func (c *httpClusterClient) reset(tr CancelableTransport, eps []string) error {
} }
func (c *httpClusterClient) Do(ctx context.Context, act HTTPAction) (resp *http.Response, body []byte, err error) { func (c *httpClusterClient) Do(ctx context.Context, act HTTPAction) (resp *http.Response, body []byte, err error) {
c.RLock()
defer c.RUnlock()
if len(c.clients) == 0 { if len(c.clients) == 0 {
return nil, nil, ErrNoEndpoints return nil, nil, ErrNoEndpoints
} }
@ -131,10 +136,15 @@ func (c *httpClusterClient) Do(ctx context.Context, act HTTPAction) (resp *http.
} }
func (c *httpClusterClient) Endpoints() []string { func (c *httpClusterClient) Endpoints() []string {
c.RLock()
defer c.RUnlock()
return c.endpoints return c.endpoints
} }
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 {