Merge pull request #1385 from msherif1234/bundle_timeout_4.10

[release-4.10] OCPBUGS-3858: Adjust ovs bundle timeout
openshift · Nov 18, 2022 · ba010b2 · ba010b2
2 parents 5edc1b0 + 7862b3b
commit ba010b2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/go-controller/pkg/node/node.go b/go-controller/pkg/node/node.go
@@ -200,6 +200,11 @@ func setupOVNNode(node *kapi.Node) error {
 			config.Default.InactivityProbe),
 		fmt.Sprintf("external_ids:ovn-openflow-probe-interval=%d",
 			config.Default.OpenFlowProbe),
+		// bundle-idle-timeout default value is 10s, it should be set
+		// as high as the ovn-openflow-probe-interval to allow ovn-controller
+		// to finish computation specially with complex acl configuration with port range.
+		fmt.Sprintf("other_config:bundle-idle-timeout=%d",
+			config.Default.OpenFlowProbe),
 		fmt.Sprintf("external_ids:hostname=\"%s\"", node.Name),
 		fmt.Sprintf("external_ids:ovn-monitor-all=%t", config.Default.MonitorAll),
 		fmt.Sprintf("external_ids:ovn-enable-lflow-cache=%t", config.Default.LFlowCacheEnable),

diff --git a/go-controller/pkg/node/node_test.go b/go-controller/pkg/node/node_test.go
@@ -226,10 +226,11 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
 						"external_ids:ovn-openflow-probe-interval=%d "+
+						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:hostname=\"%s\" "+
 						"external_ids:ovn-monitor-all=true "+
 						"external_ids:ovn-enable-lflow-cache=true",
-						nodeIP, interval, ofintval, nodeName),
+						nodeIP, interval, ofintval, ofintval, nodeName),
 				})
 				fexec.AddFakeCmd(&ovntest.ExpectedCmd{
 					Cmd: "ovs-vsctl --timeout=15 -- clear bridge br-int netflow" +
@@ -286,10 +287,11 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
 						"external_ids:ovn-openflow-probe-interval=%d "+
+						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:hostname=\"%s\" "+
 						"external_ids:ovn-monitor-all=true "+
 						"external_ids:ovn-enable-lflow-cache=true",
-						nodeIP, interval, ofintval, nodeName),
+						nodeIP, interval, ofintval, ofintval, nodeName),
 				})
 				fexec.AddFakeCmd(&ovntest.ExpectedCmd{
 					Cmd: fmt.Sprintf("ovs-vsctl --timeout=15 " +
@@ -359,12 +361,13 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
 						"external_ids:ovn-openflow-probe-interval=%d "+
+						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:hostname=\"%s\" "+
 						"external_ids:ovn-monitor-all=true "+
 						"external_ids:ovn-enable-lflow-cache=false "+
 						"external_ids:ovn-limit-lflow-cache=1000 "+
-						"external_ids:ovn-limit-lflow-cache-kb=100000",
-						nodeIP, interval, ofintval, nodeName),
+						"external_ids:ovn-memlimit-lflow-cache-kb=100000",
+						nodeIP, interval, ofintval, ofintval, nodeName),
 				})
 				fexec.AddFakeCmd(&ovntest.ExpectedCmd{
 					Cmd: "ovs-vsctl --timeout=15 -- clear bridge br-int netflow" +
@@ -424,10 +427,11 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
 						"external_ids:ovn-openflow-probe-interval=%d "+
+						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:hostname=\"%s\" "+
 						"external_ids:ovn-monitor-all=true "+
 						"external_ids:ovn-enable-lflow-cache=true",
-						nodeIP, interval, ofintval, nodeName),
+						nodeIP, interval, ofintval, ofintval, nodeName),
 				})
 
 				fexec.AddFakeCmd(&ovntest.ExpectedCmd{
@@ -495,10 +499,11 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
 						"external_ids:ovn-openflow-probe-interval=%d "+
+						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:hostname=\"%s\" "+
 						"external_ids:ovn-monitor-all=true "+
 						"external_ids:ovn-enable-lflow-cache=true",
-						nodeIP, interval, ofintval, nodeName),
+						nodeIP, interval, ofintval, ofintval, nodeName),
 				})
 
 				fexec.AddFakeCmd(&ovntest.ExpectedCmd{
@@ -566,10 +571,11 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
 						"external_ids:ovn-openflow-probe-interval=%d "+
+						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:hostname=\"%s\" "+
 						"external_ids:ovn-monitor-all=true "+
 						"external_ids:ovn-enable-lflow-cache=true",
-						nodeIP, interval, ofintval, nodeName),
+						nodeIP, interval, ofintval, ofintval, nodeName),
 				})
 
 				fexec.AddFakeCmd(&ovntest.ExpectedCmd{