Skip to content

Commit

Permalink
Move 'ODP miss' log from every miss to specific places
Browse files Browse the repository at this point in the history
Added log lines for packets that we will broadcast;
Added log lines for flows we don't know how to handle;
Moved the line for when we expect to insert a flow down to the miss-handler;
Packets handled by the bridge already have their own logging via --pktdebug
  • Loading branch information
bboreham committed Jul 1, 2016
1 parent 7684145 commit 7d0aaea
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion router/fastdp.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,11 @@ func (fastdp *FastDatapath) bridge(ingress bridgePortID, key PacketKey, lock *fa
// If we did, we'd need to delete the flows every time
// we learned a new MAC address, or have a more
// complicated selective invalidation scheme.
log.Debug("fastdp: unknown dst", ingress, key)
mfop.Add(vetoFlowCreationFlowOp{})
} else {
// A real broadcast
log.Debug("fastdp: broadcast", ingress, key)
mfop.Add(odpEthernetFlowKey(key))
}

Expand Down Expand Up @@ -424,6 +426,7 @@ func (fastdp *FastDatapath) getVxlanVportID(udpPort int) (odp.VportID, error) {

fastdp.vxlanVportIDs[udpPort] = vxlanVportID
fastdp.missHandlers[vxlanVportID] = func(fks odp.FlowKeys, lock *fastDatapathLock) FlowOp {
log.Debug("ODP miss: ", fks, " on port ", vxlanVportID)
tunnel := fks[odp.OVS_KEY_ATTR_TUNNEL].(odp.TunnelFlowKey)
tunKey := tunnel.Key()

Expand Down Expand Up @@ -939,7 +942,6 @@ func (fastdp *FastDatapath) Error(err error, stopped bool) {

func (fastdp *FastDatapath) Miss(packet []byte, fks odp.FlowKeys) error {
ingress := fks[odp.OVS_KEY_ATTR_IN_PORT].(odp.InPortFlowKey).VportID()
log.Debug("ODP miss ", fks, " on port ", ingress)

lock := fastdp.startLock()
defer lock.unlock()
Expand All @@ -948,6 +950,7 @@ func (fastdp *FastDatapath) Miss(packet []byte, fks odp.FlowKeys) error {

handler := fastdp.getMissHandler(ingress)
if handler == nil {
log.Debug("ODP miss (no handler): ", fks, " on port ", ingress)
return nil
}

Expand Down

0 comments on commit 7d0aaea

Please sign in to comment.