Skip to content

Commit

Permalink
Merge pull request #10595 from johncming/locking
Browse files Browse the repository at this point in the history
clientv3: modify lock type.
  • Loading branch information
xiang90 authored Apr 30, 2019
2 parents e3f3753 + 9b5c468 commit 1bd02b2
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions clientv3/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type Client struct {
creds *credentials.TransportCredentials
balancer balancer.Balancer
resolverGroup *endpoint.ResolverGroup
mu *sync.Mutex
mu *sync.RWMutex

ctx context.Context
cancel context.CancelFunc
Expand Down Expand Up @@ -143,11 +143,13 @@ func (c *Client) Close() error {
func (c *Client) Ctx() context.Context { return c.ctx }

// Endpoints lists the registered endpoints for the client.
func (c *Client) Endpoints() (eps []string) {
func (c *Client) Endpoints() []string {
// copy the slice; protect original endpoints from being changed
eps = make([]string, len(c.cfg.Endpoints))
c.mu.RLock()
defer c.mu.RUnlock()
eps := make([]string, len(c.cfg.Endpoints))
copy(eps, c.cfg.Endpoints)
return
return eps
}

// SetEndpoints updates client's endpoints.
Expand Down Expand Up @@ -442,7 +444,7 @@ func newClient(cfg *Config) (*Client, error) {
creds: creds,
ctx: ctx,
cancel: cancel,
mu: new(sync.Mutex),
mu: new(sync.RWMutex),
callOpts: defaultCallOpts,
}

Expand Down

0 comments on commit 1bd02b2

Please sign in to comment.