Skip to content
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

Fix cluster loopback handling. Fixes #589 #839

Merged
merged 1 commit into from
Aug 15, 2018
Merged

Fix cluster loopback handling. Fixes #589 #839

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
72 changes: 32 additions & 40 deletions cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,15 @@ func newClusterState(
createdAt: time.Now(),
}

isLoopbackOrigin := isLoopbackAddr(origin)
originHost, _, _ := net.SplitHostPort(origin)
isLoopbackOrigin := isLoopback(originHost)

for _, slot := range slots {
var nodes []*clusterNode
for i, slotNode := range slot.Nodes {
addr := slotNode.Addr
if !isLoopbackOrigin && useOriginAddr(origin, addr) {
addr = origin
if !isLoopbackOrigin {
addr = replaceLoopbackHost(addr, originHost)
}

node, err := c.nodes.GetOrCreate(addr)
Expand Down Expand Up @@ -477,6 +479,33 @@ func newClusterState(
return &c, nil
}

func replaceLoopbackHost(nodeAddr, originHost string) string {
nodeHost, nodePort, err := net.SplitHostPort(nodeAddr)
if err != nil {
return nodeAddr
}

nodeIP := net.ParseIP(nodeHost)
if nodeIP == nil {
return nodeAddr
}

if !nodeIP.IsLoopback() {
return nodeAddr
}

// Use origin host which is not loopback and node port.
return net.JoinHostPort(originHost, nodePort)
}

func isLoopback(host string) bool {
ip := net.ParseIP(host)
if ip == nil {
return true
}
return ip.IsLoopback()
}

func (c *clusterState) slotMasterNode(slot int) (*clusterNode, error) {
nodes := c.slotNodes(slot)
if len(nodes) > 0 {
Expand Down Expand Up @@ -1564,43 +1593,6 @@ func (c *ClusterClient) PSubscribe(channels ...string) *PubSub {
return pubsub
}

func useOriginAddr(originAddr, nodeAddr string) bool {
nodeHost, nodePort, err := net.SplitHostPort(nodeAddr)
if err != nil {
return false
}

nodeIP := net.ParseIP(nodeHost)
if nodeIP == nil {
return false
}

if !nodeIP.IsLoopback() {
return false
}

_, originPort, err := net.SplitHostPort(originAddr)
if err != nil {
return false
}

return nodePort == originPort
}

func isLoopbackAddr(addr string) bool {
host, _, err := net.SplitHostPort(addr)
if err != nil {
return false
}

ip := net.ParseIP(host)
if ip == nil {
return false
}

return ip.IsLoopback()
}

func appendUniqueNode(nodes []*clusterNode, node *clusterNode) []*clusterNode {
for _, n := range nodes {
if n == node {
Expand Down