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

dhcp: don't swallow err from netns switch

Browse Source
This commit is contained in:
Eugene Yakubovich 2015-06-15 11:32:33 -07:00
parent 50c14e6223
commit 8b6b04773e
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,20 +73,19 @@ func AcquireLease(clientID, netns, ifName string) (*DHCPLease, error) {
log.Printf("%v: acquiring lease", clientID) log.Printf("%v: acquiring lease", clientID)
l.wg.Add(1) l.wg.Add(1)
go ns.WithNetNSPath(netns, true, func(_ *os.File) (e error) { go func() {
errCh <- ns.WithNetNSPath(netns, true, func(_ *os.File) error {
defer l.wg.Done() defer l.wg.Done()
link, err := netlink.LinkByName(ifName) link, err := netlink.LinkByName(ifName)
if err != nil { if err != nil {
errCh <- fmt.Errorf("error looking up %q", ifName) return fmt.Errorf("error looking up %q: %v", ifName, err)
return
} }
l.link = link l.link = link
if err = l.acquire(); err != nil { if err = l.acquire(); err != nil {
errCh <- err return err
return
} }
log.Printf("%v: lease acquired, expiration is %v", l.clientID, l.expireTime) log.Printf("%v: lease acquired, expiration is %v", l.clientID, l.expireTime)
@ -94,11 +93,11 @@ func AcquireLease(clientID, netns, ifName string) (*DHCPLease, error) {
errCh <- nil errCh <- nil
l.maintain() l.maintain()
return return nil
}) })
}()
err := <-errCh if err := <-errCh; err != nil {
if err != nil {
return nil, err return nil, err
} }