Merge pull request #1238 from mrjana/lb

Do not panic if failed to get ipvs family
This commit is contained in:
Alessandro Boch 2016-06-10 08:54:01 -07:00 committed by GitHub
commit 562fd97f8a
1 changed files with 2 additions and 2 deletions

View File

@ -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.")
}
})
}