node, metrics: Replace depracated option with equivalent

The option "ovn-openflow-probe-interval" is ignored from ovn24.03.
Replace it with "ovn-bridge-remote-probe-interval" which serves
similar purpose with the difference that from 24.09 it affects all
connections to br-int, not only the main thread.

At the same time change the default to 0 which is disabled, the
inactivity probe shouldn't be needed for connections over unix
socket.

Signed-off-by: Ales Musil <[email protected]>

Author: almusil

go-controller/pkg/config/config.go

@@ -67,7 +67,7 @@ var (
 		EncapIP:                      "",
 		EncapPort:                    DefaultEncapPort,
 		InactivityProbe:              100000, // in Milliseconds
-		OpenFlowProbe:                180,    // in Seconds
+		OpenFlowProbe:                0,      // in Milliseconds
 		OfctrlWaitBeforeClear:        0,      // in Milliseconds
 		MonitorAll:                   true,
 		OVSDBTxnTimeout:              DefaultDBTxnTimeout,

go-controller/pkg/metrics/ovn.go

@@ -252,16 +252,16 @@ var ovnControllerStopwatchShowMetricsMap = map[string]*stopwatchMetricDetails{
 }
 
 // setOvnControllerConfigurationMetrics updates ovn-controller configuration
-// values (ovn-openflow-probe-interval, ovn-remote-probe-interval, ovn-monitor-all,
+// values (ovn-bridge-remote-probe-interval, ovn-remote-probe-interval, ovn-monitor-all,
 // ovn-encap-ip, ovn-encap-type, ovn-remote) obtained from Open_vSwitch entry updates
 func setOvnControllerConfigurationMetrics(ovsDBClient libovsdbclient.Client) (err error) {
 	openvSwitch, err := ovsops.GetOpenvSwitch(ovsDBClient)
 	if err != nil {
 		return fmt.Errorf("failed to get Open_vSwitch entry (%v)", err)
 	}
 
-	openflowProbeField := openvSwitch.ExternalIDs["ovn-openflow-probe-interval"]
-	openflowProbeVal := parseMetricToFloat(MetricOvnSubsystemController, "ovn-openflow-probe-interval", openflowProbeField)
+	openflowProbeField := openvSwitch.ExternalIDs["ovn-bridge-remote-probe-interval"]
+	openflowProbeVal := parseMetricToFloat(MetricOvnSubsystemController, "ovn-bridge-remote-probe-interval", openflowProbeField)
 	metricOpenFlowProbeInterval.Set(openflowProbeVal)
 
 	remoteProbeField := openvSwitch.ExternalIDs["ovn-remote-probe-interval"]

go-controller/pkg/node/default_node_network_controller.go

@@ -405,10 +405,10 @@ func setupOVNNode(node *corev1.Node) error {
 		fmt.Sprintf("external_ids:ovn-encap-ip=%s", config.Default.EffectiveEncapIP),
 		fmt.Sprintf("external_ids:ovn-remote-probe-interval=%d",
 			config.Default.InactivityProbe),
-		fmt.Sprintf("external_ids:ovn-openflow-probe-interval=%d",
+		fmt.Sprintf("external_ids:ovn-bridge-remote-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
+		// as high as the ovn-bridge-remote-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),

go-controller/pkg/node/default_node_network_controller_test.go

@@ -254,7 +254,7 @@ var _ = Describe("Node", func() {
 					nodeIP   string = "1.2.5.6"
 					nodeName string = "cannot.be.resolv.ed"
 					interval int    = 100000
-					ofintval int    = 180
+					ofintval int    = 0
 				)
 				node := corev1.Node{
 					ObjectMeta: metav1.ObjectMeta{
@@ -276,7 +276,7 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-type=geneve "+
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
-						"external_ids:ovn-openflow-probe-interval=%d "+
+						"external_ids:ovn-bridge-remote-probe-interval=%d "+
 						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:ovn-is-interconn=false "+
 						"external_ids:ovn-monitor-all=true "+
@@ -317,7 +317,7 @@ var _ = Describe("Node", func() {
 					nodeName    string = "cannot.be.resolv.ed"
 					encapPort   uint   = 666
 					interval    int    = 100000
-					ofintval    int    = 180
+					ofintval    int    = 0
 					chassisUUID string = "1a3dfc82-2749-4931-9190-c30e7c0ecea3"
 					encapUUID   string = "e4437094-0094-4223-9f14-995d98d5fff8"
 				)
@@ -360,7 +360,7 @@ var _ = Describe("Node", func() {
 					nodeIP   string = "1.2.5.6"
 					nodeName string = "cannot.be.resolv.ed"
 					interval int    = 100000
-					ofintval int    = 180
+					ofintval int    = 0
 				)
 				node := corev1.Node{
 					ObjectMeta: metav1.ObjectMeta{
@@ -382,7 +382,7 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-type=geneve "+
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
-						"external_ids:ovn-openflow-probe-interval=%d "+
+						"external_ids:ovn-bridge-remote-probe-interval=%d "+
 						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:ovn-is-interconn=false "+
 						"external_ids:ovn-monitor-all=true "+
@@ -427,7 +427,7 @@ var _ = Describe("Node", func() {
 					nodeIP    string = "1.2.5.6"
 					nodeName  string = "cannot.be.resolv.ed"
 					interval  int    = 100000
-					ofintval  int    = 180
+					ofintval  int    = 0
 					ipfixPort int32  = 456
 				)
 				ipfixIP := net.IP{1, 2, 3, 4}
@@ -452,7 +452,7 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-type=geneve "+
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
-						"external_ids:ovn-openflow-probe-interval=%d "+
+						"external_ids:ovn-bridge-remote-probe-interval=%d "+
 						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:ovn-is-interconn=false "+
 						"external_ids:ovn-monitor-all=true "+
@@ -502,7 +502,7 @@ var _ = Describe("Node", func() {
 					nodeIP    string = "1.2.5.6"
 					nodeName  string = "cannot.be.resolv.ed"
 					interval  int    = 100000
-					ofintval  int    = 180
+					ofintval  int    = 0
 					ipfixPort int32  = 456
 				)
 				ipfixIP := net.IP{1, 2, 3, 4}
@@ -527,7 +527,7 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-type=geneve "+
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
-						"external_ids:ovn-openflow-probe-interval=%d "+
+						"external_ids:ovn-bridge-remote-probe-interval=%d "+
 						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:ovn-is-interconn=false "+
 						"external_ids:ovn-monitor-all=true "+
@@ -580,7 +580,7 @@ var _ = Describe("Node", func() {
 					nodeIP   string = "1.2.5.6"
 					nodeName string = "anyhost.test"
 					interval int    = 100000
-					ofintval int    = 180
+					ofintval int    = 0
 				)
 				node := corev1.Node{
 					ObjectMeta: metav1.ObjectMeta{
@@ -602,7 +602,7 @@ var _ = Describe("Node", func() {
 						"external_ids:ovn-encap-type=geneve "+
 						"external_ids:ovn-encap-ip=%s "+
 						"external_ids:ovn-remote-probe-interval=%d "+
-						"external_ids:ovn-openflow-probe-interval=%d "+
+						"external_ids:ovn-bridge-remote-probe-interval=%d "+
 						"other_config:bundle-idle-timeout=%d "+
 						"external_ids:ovn-is-interconn=false "+
 						"external_ids:ovn-monitor-all=true "+