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

Jump to bottom

Fix ipv6 join failure on upgrade 0.7.2 to 0.8 #2878

Closed
wants to merge 1 commit into from
Closed

Fix ipv6 join failure on upgrade 0.7.2 to 0.8 #2878

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
11 changes: 11 additions & 0 deletions consul/servers/serf_flooder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ func FloodJoins(logger *log.Logger, portFn FloodPortFn,
// leave it blank to behave as if we just supplied an address.
if port, ok := portFn(server); ok {
addr = net.JoinHostPort(addr, fmt.Sprintf("%d", port))
} else {
// globalSerf.Join expects bracketed ipv6 addresses
ip := net.ParseIP(addr)
if ip == nil {
// should never happen
logger.Printf("[DEBUG] consul: Failed to parse IP %s", addr)
}
// If we have an IPv6 address, we should add brackets
if ip.To4() == nil {
addr = fmt.Sprintf("[%s]", addr)
}
}

// Do the join!
Expand Down