From b19f2df6f813ed1626fda754e6eb666294f5fc36 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 3 May 2017 14:35:20 +0000 Subject: [PATCH] Improve hairpin log messages --- prog/weaver/main.go | 3 ++- router/fastdp.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index f2666188..e605edda 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -231,7 +231,8 @@ func main() { if bridge != nil { if err := weavenet.DetectHairpin("vethwe-bridge", Log); err != nil { - Log.Errorf("DetectHairpin failed: %s", err) + Log.Errorf("Setting may cause connectivity issues : %s", err) + Log.Infof("Hairpin mode may have been enabled by other software on this machine") } } diff --git a/router/fastdp.go b/router/fastdp.go index 78785413..c5ffe13d 100644 --- a/router/fastdp.go +++ b/router/fastdp.go @@ -1224,7 +1224,7 @@ func (fastdp *FastDatapath) send(fops FlowOp, frame []byte, lock *fastDatapathLo } if fastdp.isHairpinFlow(&flow) { - log.Error("Vetoed installation of hairpin flow ", flow) + log.Warning("Vetoed installation of hairpin flow ", flow) return }