Skip to content

fix(vmwarevsphere): use WaitForIP instead of WaitForNetIP to fix hang with multiple NICs #367

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

Open
scheidet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(vmwarevsphere): use WaitForIP instead of WaitForNetIP to fix hang with multiple NICs #367

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
29 changes: 10 additions & 19 deletions drivers/vmwarevsphere/vsphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,31 +186,22 @@ func (d *Driver) GetIP() (string, error) {
return "", err
}

configuredMacIPs, err := vm.WaitForNetIP(d.getCtx(), false)
// WaitForNetIP blocks until ALL NICs have an IP, which hangs indefinitely
// when multiple networks are configured but only one has DHCP.
// WaitForIP watches guest.ipAddress (the primary IP reported by VMware Tools)
// and works correctly regardless of how many NICs the VM has.
ip, err := vm.WaitForIP(d.getCtx(), true)
if err != nil {
return "", err
}

for _, ips := range configuredMacIPs {
if len(ips) >= 0 {
// Prefer IPv4 address, but fall back to first/IPv6
preferredIP := ips[0]
for _, ip := range ips {
// In addition to non IPv4 addresses, try to filter
// out link local addresses and the default address of
// the Docker0 bridge
netIP := net.ParseIP(ip)
if netIP.To4() != nil && netIP.IsGlobalUnicast() && !netIP.Equal(net.ParseIP(dockerBridgeIP)) {
preferredIP = ip
break
}
}
d.IPAddress = preferredIP // cache
return preferredIP, nil
}
netIP := net.ParseIP(ip)
if netIP == nil || netIP.To4() == nil || !netIP.IsGlobalUnicast() || netIP.Equal(net.ParseIP(dockerBridgeIP)) {
return "", errors.New("No valid IP despite waiting for one - check DHCP status")
}

return "", errors.New("No IP despite waiting for one - check DHCP status")
d.IPAddress = ip
return ip, nil
}

func (d *Driver) GetState() (state.State, error) {
Expand Down