Skip to content
This repository was archived by the owner on Dec 7, 2023. It is now read-only.

Commit 1995743

Browse files
committed
Add context to netlink errors
Otherwise it just says something like 'invalid argument' and you have to guess what the problem is
1 parent 6e2f25c commit 1995743

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

pkg/container/network.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"net"
77
"time"
88

9+
"github.com/pkg/errors"
910
log "github.com/sirupsen/logrus"
1011
"github.com/vishvananda/netlink"
1112
"github.com/weaveworks/ignite/pkg/constants"
@@ -118,17 +119,17 @@ func bridge(iface *net.Interface) (*DHCPInterface, error) {
118119

119120
eth, err := netlink.LinkByIndex(iface.Index)
120121
if err != nil {
121-
return nil, err
122+
return nil, errors.Wrap(err, "LinkByIndex")
122123
}
123124

124125
tuntap, err := createTAPAdapter(tapName)
125126
if err != nil {
126-
return nil, err
127+
return nil, errors.Wrap(err, "createTAPAdapter")
127128
}
128129

129130
bridge, err := createBridge(bridgeName)
130131
if err != nil {
131-
return nil, err
132+
return nil, errors.Wrap(err, "createBridge")
132133
}
133134

134135
if err := setMaster(bridge, tuntap, eth); err != nil {
@@ -229,7 +230,7 @@ func createBridge(bridgeName string) (*netlink.Bridge, error) {
229230
// the lowest address of an attached device, hence change over time.
230231
mac, err := randomMAC()
231232
if err != nil {
232-
return nil, err
233+
return nil, errors.Wrap(err, "creating random MAC")
233234
}
234235
la.HardwareAddr = mac
235236

@@ -263,14 +264,14 @@ func randomMAC() (net.HardwareAddr, error) {
263264
mac[0] = (mac[0] & 0xFE) | 0x02
264265

265266
return net.HardwareAddr(mac), nil
266-
}
267+
}
267268

268269
func setMaster(master netlink.Link, links ...netlink.Link) error {
269270
masterIndex := master.Attrs().Index
270271

271272
for _, link := range links {
272273
if err := netlink.LinkSetMasterByIndex(link, masterIndex); err != nil {
273-
return err
274+
return errors.Wrapf(err, "setMaster %s %s", master.Attrs().Name, link.Attrs().Name)
274275
}
275276
}
276277

0 commit comments

Comments
 (0)