Skip to content

Fix cmdsInfo to create node #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2019
Merged

Fix cmdsInfo to create node #1072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,20 +326,7 @@ func (c *clusterNodes) GC(generation uint32) {
}

func (c *clusterNodes) Get(addr string) (*clusterNode, error) {
var node *clusterNode
var err error
c.mu.RLock()
if c.closed {
err = pool.ErrClosed
} else {
node = c.allNodes[addr]
}
c.mu.RUnlock()
return node, err
}

func (c *clusterNodes) GetOrCreate(addr string) (*clusterNode, error) {
node, err := c.Get(addr)
node, err := c.get(addr)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -368,6 +355,19 @@ func (c *clusterNodes) GetOrCreate(addr string) (*clusterNode, error) {
return node, err
}

func (c *clusterNodes) get(addr string) (*clusterNode, error) {
var node *clusterNode
var err error
c.mu.RLock()
if c.closed {
err = pool.ErrClosed
} else {
node = c.allNodes[addr]
}
c.mu.RUnlock()
return node, err
}

func (c *clusterNodes) All() ([]*clusterNode, error) {
c.mu.RLock()
defer c.mu.RUnlock()
Expand All @@ -390,7 +390,7 @@ func (c *clusterNodes) Random() (*clusterNode, error) {
}

n := rand.Intn(len(addrs))
return c.GetOrCreate(addrs[n])
return c.Get(addrs[n])
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -448,7 +448,7 @@ func newClusterState(
addr = replaceLoopbackHost(addr, originHost)
}

node, err := c.nodes.GetOrCreate(addr)
node, err := c.nodes.Get(addr)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -795,7 +795,7 @@ func (c *ClusterClient) process(ctx context.Context, cmd Cmder) error {
var addr string
moved, ask, addr = internal.IsMovedError(err)
if moved || ask {
node, err = c.nodes.GetOrCreate(addr)
node, err = c.nodes.Get(addr)
if err != nil {
break
}
Expand Down Expand Up @@ -980,7 +980,7 @@ func (c *ClusterClient) loadState() (*clusterState, error) {

var firstErr error
for _, addr := range addrs {
node, err := c.nodes.GetOrCreate(addr)
node, err := c.nodes.Get(addr)
if err != nil {
if firstErr == nil {
firstErr = err
Expand Down Expand Up @@ -1192,7 +1192,7 @@ func (c *ClusterClient) checkMovedErr(
if moved {
c.state.LazyReload()

node, err := c.nodes.GetOrCreate(addr)
node, err := c.nodes.Get(addr)
if err != nil {
return false
}
Expand All @@ -1204,7 +1204,7 @@ func (c *ClusterClient) checkMovedErr(
}

if ask {
node, err := c.nodes.GetOrCreate(addr)
node, err := c.nodes.Get(addr)
if err != nil {
return false
}
Expand Down Expand Up @@ -1406,7 +1406,7 @@ func (c *ClusterClient) Watch(fn func(*Tx) error, keys ...string) error {

moved, ask, addr := internal.IsMovedError(err)
if moved || ask {
node, err = c.nodes.GetOrCreate(addr)
node, err = c.nodes.Get(addr)
if err != nil {
return err
}
Expand Down