From 1dbff60121b42f603ada346962ffa6edaaefc018 Mon Sep 17 00:00:00 2001 From: Jana Radhakrishnan Date: Fri, 10 Jun 2016 08:32:39 -0700 Subject: [PATCH] Do not panic if failed to get ipvs family Instead log a descriptive error message. Signed-off-by: Jana Radhakrishnan --- libnetwork/ipvs/netlink.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetwork/ipvs/netlink.go b/libnetwork/ipvs/netlink.go index b4f3f5d215..509c288f70 100644 --- a/libnetwork/ipvs/netlink.go +++ b/libnetwork/ipvs/netlink.go @@ -59,12 +59,12 @@ func setup() { ipvsOnce.Do(func() { var err error if out, err := exec.Command("modprobe", "-va", "ip_vs").CombinedOutput(); err != nil { - logrus.Warnf("Running modprobe nf_nat failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) + logrus.Warnf("Running modprobe ip_vs failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) } ipvsFamily, err = getIPVSFamily() if err != nil { - panic("could not get ipvs family") + logrus.Errorf("Could not get ipvs family information from the kernel. It is possible that ipvs is not enabled in your kernel. Native loadbalancing will not work until this is fixed.") } }) }