Skip to content

Commit

Permalink
vxlan: user verbose logging macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsoriano
jsoriano committed Nov 24, 2016
1 parent f6d7239 commit a7cc634
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions backend/vxlan/device.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ type neigh struct {
}

func (dev *vxlanDevice) GetL2List() ([]netlink.Neigh, error) {
log.Infof("calling GetL2List() dev.link.Index: %d ", dev.link.Index)
log.V(4).Infof("calling GetL2List() dev.link.Index: %d ", dev.link.Index)
return netlink.NeighList(dev.link.Index, syscall.AF_BRIDGE)
}

func (dev *vxlanDevice) AddL2(n neigh) error {
log.Infof("calling NeighAdd: %v, %v", n.IP, n.MAC)
log.V(4).Infof("calling NeighAdd: %v, %v", n.IP, n.MAC)
return netlink.NeighAdd(&netlink.Neigh{
LinkIndex: dev.link.Index,
State: netlink.NUD_PERMANENT,
Expand All @@ -177,7 +177,7 @@ func (dev *vxlanDevice) AddL2(n neigh) error {
}

func (dev *vxlanDevice) DelL2(n neigh) error {
log.Infof("calling NeighDel: %v, %v", n.IP, n.MAC)
log.V(4).Infof("calling NeighDel: %v, %v", n.IP, n.MAC)
return netlink.NeighDel(&netlink.Neigh{
LinkIndex: dev.link.Index,
Family: syscall.AF_BRIDGE,
Expand All @@ -188,7 +188,7 @@ func (dev *vxlanDevice) DelL2(n neigh) error {
}

func (dev *vxlanDevice) AddL3(n neigh) error {
log.Infof("calling NeighSet: %v, %v", n.IP, n.MAC)
log.V(4).Infof("calling NeighSet: %v, %v", n.IP, n.MAC)
return netlink.NeighSet(&netlink.Neigh{
LinkIndex: dev.link.Index,
State: netlink.NUD_REACHABLE,
Expand All @@ -199,7 +199,7 @@ func (dev *vxlanDevice) AddL3(n neigh) error {
}

func (dev *vxlanDevice) DelL3(n neigh) error {
log.Infof("calling NeighDel: %v, %v", n.IP, n.MAC)
log.V(4).Infof("calling NeighDel: %v, %v", n.IP, n.MAC)
return netlink.NeighDel(&netlink.Neigh{
LinkIndex: dev.link.Index,
State: netlink.NUD_REACHABLE,
Expand Down
24 changes: 12 additions & 12 deletions backend/vxlan/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ func newNetwork(name string, sm subnet.Manager, extIface *backend.ExternalInterf
}

func (n *network) Run(ctx context.Context) {
log.Info("Watching for L3 misses")
log.V(1).Info("Watching for L3 misses")
misses := make(chan *netlink.Neigh, 100)
// Unfrtunately MonitorMisses does not take a cancel channel
// as there's no wait to interrupt netlink socket recv
go n.dev.MonitorMisses(misses)

wg := sync.WaitGroup{}

log.Info("Watching for new subnet leases")
log.V(1).Info("Watching for new subnet leases")
evts := make(chan []subnet.Event)
wg.Add(1)
go func() {
subnet.WatchLeases(ctx, n.sm, n.name, n.SubnetLease, evts)
log.Info("WatchLeases exited")
log.V(1).Info("WatchLeases exited")
wg.Done()
}()

Expand Down Expand Up @@ -115,7 +115,7 @@ func (n *network) handleSubnetEvents(batch []subnet.Event) {
for _, evt := range batch {
switch evt.Type {
case subnet.EventAdded:
log.Info("Subnet added: ", evt.Lease.Subnet)
log.V(1).Info("Subnet added: ", evt.Lease.Subnet)

if evt.Lease.Attrs.BackendType != "vxlan" {
log.Warningf("Ignoring non-vxlan subnet: type=%v", evt.Lease.Attrs.BackendType)
Expand All @@ -131,7 +131,7 @@ func (n *network) handleSubnetEvents(batch []subnet.Event) {
n.dev.AddL2(neigh{IP: evt.Lease.Attrs.PublicIP, MAC: net.HardwareAddr(attrs.VtepMAC)})

case subnet.EventRemoved:
log.Info("Subnet removed: ", evt.Lease.Subnet)
log.V(1).Info("Subnet removed: ", evt.Lease.Subnet)

if evt.Lease.Attrs.BackendType != "vxlan" {
log.Warningf("Ignoring non-vxlan subnet: type=%v", evt.Lease.Attrs.BackendType)
Expand All @@ -156,14 +156,14 @@ func (n *network) handleSubnetEvents(batch []subnet.Event) {
}

func (n *network) handleInitialSubnetEvents(batch []subnet.Event) error {
log.Infof("Handling initial subnet events")
log.V(1).Infof("Handling initial subnet events")
fdbTable, err := n.dev.GetL2List()
if err != nil {
return fmt.Errorf("error fetching L2 table: %v", err)
}

for _, fdbEntry := range fdbTable {
log.Infof("fdb already populated with: %s %s ", fdbEntry.IP, fdbEntry.HardwareAddr)
log.V(1).Infof("fdb already populated with: %s %s ", fdbEntry.IP, fdbEntry.HardwareAddr)
}

evtMarker := make([]bool, len(batch))
Expand Down Expand Up @@ -217,28 +217,28 @@ func (n *network) handleInitialSubnetEvents(batch []subnet.Event) error {
func (n *network) handleMiss(miss *netlink.Neigh) {
switch {
case len(miss.IP) == 0 && len(miss.HardwareAddr) == 0:
log.Info("Ignoring nil miss")
log.V(2).Info("Ignoring nil miss")

case len(miss.HardwareAddr) == 0:
n.handleL3Miss(miss)

default:
log.Infof("Ignoring not a miss: %v, %v", miss.HardwareAddr, miss.IP)
log.V(2).Infof("Ignoring not a miss: %v, %v", miss.HardwareAddr, miss.IP)
}
}

func (n *network) handleL3Miss(miss *netlink.Neigh) {
log.Infof("L3 miss: %v", miss.IP)
log.V(2).Infof("L3 miss: %v", miss.IP)

rt := n.rts.findByNetwork(ip.FromIP(miss.IP))
if rt == nil {
log.Infof("Route for %v not found", miss.IP)
log.V(1).Infof("Route for %v not found", miss.IP)
return
}

if err := n.dev.AddL3(neigh{IP: ip.FromIP(miss.IP), MAC: rt.vtepMAC}); err != nil {
log.Errorf("AddL3 failed: %v", err)
} else {
log.Info("AddL3 succeeded")
log.V(2).Info("AddL3 succeeded")
}
}

0 comments on commit a7cc634

Please sign in to comment.