fix: add a periodically recompute to ovn-controller to avoid inconsis…

…tency ovn 2.12 use a new incremental process engine that increase the performance of ovn-controller. However we meet inconsistency between ovn-sb and ovs several times, so we pick the recompute patch from upstream and periodically invoke it to keep consistent (cherry picked from commit dc92afa)
kubeovn · Jan 9, 2020 · 61b7dde · 61b7dde
1 parent 9de9d0b
commit 61b7dde
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/dist/images/Dockerfile.cni b/dist/images/Dockerfile.cni
@@ -14,7 +14,7 @@ RUN yum install -y  \
         yum clean all
 
 ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=3
+ENV OVS_SUBVERSION=4
 
 RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
     rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \

diff --git a/dist/images/Dockerfile.controller b/dist/images/Dockerfile.controller
@@ -14,7 +14,7 @@ RUN yum install -y  \
         yum clean all
 
 ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=3
+ENV OVS_SUBVERSION=4
 
 RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
     rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \

diff --git a/dist/images/Dockerfile.db b/dist/images/Dockerfile.db
@@ -14,7 +14,7 @@ RUN yum install -y  \
         yum clean all
 
 ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=3
+ENV OVS_SUBVERSION=4
 
 RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
     rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \

diff --git a/dist/images/Dockerfile.node b/dist/images/Dockerfile.node
@@ -14,7 +14,7 @@ RUN yum install -y  \
         yum clean all
 
 ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=3
+ENV OVS_SUBVERSION=4
 
 RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
     rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \

diff --git a/dist/images/Dockerfile.pinger b/dist/images/Dockerfile.pinger
@@ -14,7 +14,7 @@ RUN yum install -y  \
         yum clean all
 
 ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=3
+ENV OVS_SUBVERSION=4
 
 RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
     rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \

diff --git a/dist/images/Dockerfile.webhook b/dist/images/Dockerfile.webhook
@@ -14,7 +14,7 @@ RUN yum install -y  \
         yum clean all
 
 ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=3
+ENV OVS_SUBVERSION=4
 
 RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
     rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -3,6 +3,7 @@ package daemon
 import (
 	"fmt"
 	"net"
+	"os/exec"
 	"time"
 
 	"k8s.io/client-go/kubernetes/scheme"
@@ -348,6 +349,7 @@ func (c *Controller) Run(stopCh <-chan struct{}) error {
 		return err
 	}
 	c.protocol = util.CheckProtocol(node.Annotations[util.IpAddressAnnotation])
+	go wait.Until(recompute, 10 * time.Minute, stopCh)
 	go wait.Until(c.runGateway, 3 * time.Second, stopCh)
 
 	klog.Info("Started workers")
@@ -356,3 +358,10 @@ func (c *Controller) Run(stopCh <-chan struct{}) error {
 
 	return nil
 }
+
+func recompute() {
+	output, err := exec.Command("ovs-appctl", "-t", "ovn-controller", "recompute").CombinedOutput()
+	if err != nil {
+		klog.Errorf("failed to recompute ovn-controller %s", string(output))
+	}
+}