ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #1076 from lisongmin/main

Browse Source 
Fix unnecessary retrying when the link is down in dhcp
This commit is contained in:
Casey Callendrello 2024-08-27 10:31:03 +02:00 committed by GitHub
commit 3653221fad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/ipam/dhcp/lease.go
View File

@ -234,19 +234,19 @@ func (l *DHCPLease) getAllOptions() dhcp4.Options {
} }
func (l *DHCPLease) acquire() error { func (l *DHCPLease) acquire() error {
if (l.link.Attrs().Flags & net.FlagUp) != net.FlagUp {
log.Printf("Link %q down. Attempting to set up", l.link.Attrs().Name)
if err := netlink.LinkSetUp(l.link); err != nil {
return err
}
}
c, err := newDHCPClient(l.link, l.timeout, l.broadcast) c, err := newDHCPClient(l.link, l.timeout, l.broadcast)
if err != nil { if err != nil {
return err return err
} }
defer c.Close() defer c.Close()
if (l.link.Attrs().Flags & net.FlagUp) != net.FlagUp {
log.Printf("Link %q down. Attempting to set up", l.link.Attrs().Name)
if err = netlink.LinkSetUp(l.link); err != nil {
return err
}
}
opts := l.getAllOptions() opts := l.getAllOptions()
pkt, err := backoffRetry(l.resendMax, func() (*dhcp4.Packet, error) { pkt, err := backoffRetry(l.resendMax, func() (*dhcp4.Packet, error) {