Skip to content

Commit 7d3dc03

Browse files
zbb88888zbb88888
committed
add dpdk probe (#3151)
* add dpdk probe Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com> * add default probe Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com> --------- Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
1 parent 223cc61 commit 7d3dc03

File tree

6 files changed

+39
-8
lines changed

6 files changed

+39
-8
lines changed

‎charts/templates/ovn-dpdk-ds.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ spec:
5656
fieldPath: spec.nodeName
5757
- name: OVN_DB_IPS
5858
value: "{{ .Values.MASTER_NODES }}"
59+
- name: OVN_REMOTE_PROBE_INTERVAL
60+
value: "{{ .Values.networking.OVN_REMOTE_PROBE_INTERVAL }}"
61+
- name: OVN_REMOTE_OPENFLOW_INTERVAL
62+
value: "{{ .Values.networking.OVN_REMOTE_OPENFLOW_INTERVAL }}"
5963
volumeMounts:
6064
- mountPath: /opt/ovs-config
6165
name: host-config-ovs

‎dist/images/install.sh

+8
Original file line numberDiff line numberDiff line change
@@ -3377,6 +3377,10 @@ spec:
33773377
fieldPath: spec.nodeName
33783378
- name: OVN_DB_IPS
33793379
value: $addresses
3380+
- name: OVN_REMOTE_PROBE_INTERVAL
3381+
value: "10000"
3382+
- name: OVN_REMOTE_OPENFLOW_INTERVAL
3383+
value: "180"
33803384
volumeMounts:
33813385
- mountPath: /var/run/netns
33823386
name: host-ns
@@ -3718,6 +3722,10 @@ spec:
37183722
fieldPath: spec.nodeName
37193723
- name: OVN_DB_IPS
37203724
value: $addresses
3725+
- name: OVN_REMOTE_PROBE_INTERVAL
3726+
value: "10000"
3727+
- name: OVN_REMOTE_OPENFLOW_INTERVAL
3728+
value: "180"
37213729
volumeMounts:
37223730
- mountPath: /opt/ovs-config
37233731
name: host-config-ovs

‎dist/images/start-ovs-dpdk-v2.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash
22

33
set -euo pipefail
4+
OVN_REMOTE_PROBE_INTERVAL=${OVN_REMOTE_PROBE_INTERVAL:-10000}
5+
OVN_REMOTE_OPENFLOW_INTERVAL=${OVN_REMOTE_OPENFLOW_INTERVAL:-180}
6+
7+
echo "OVN_REMOTE_PROBE_INTERVAL is set to $OVN_REMOTE_PROBE_INTERVAL"
8+
echo "OVN_REMOTE_OPENFLOW_INTERVAL is set to $OVN_REMOTE_OPENFLOW_INTERVAL"
49

510
DPDK_TUNNEL_IFACE=${DPDK_TUNNEL_IFACE:-br-phy}
611
TUNNEL_TYPE=${TUNNEL_TYPE:-geneve}
@@ -121,8 +126,8 @@ ovn-ctl restart_controller
121126

122127
# Set remote ovn-sb for ovn-controller to connect to
123128
ovs-vsctl set open . external-ids:ovn-remote=tcp:"${OVN_SB_SERVICE_HOST}":"${OVN_SB_SERVICE_PORT}"
124-
ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
125-
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
129+
ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
130+
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
126131
ovs-vsctl set open . external-ids:ovn-encap-type="${TUNNEL_TYPE}"
127132

128133
tail --follow=name --retry /var/log/openvswitch/ovs-vswitchd.log

‎dist/images/start-ovs-dpdk.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ trap quit EXIT
1010

1111
CONFIG_FILE=/opt/ovs-config/config.cfg
1212

13+
OVN_REMOTE_PROBE_INTERVAL=${OVN_REMOTE_PROBE_INTERVAL:-10000}
14+
OVN_REMOTE_OPENFLOW_INTERVAL=${OVN_REMOTE_OPENFLOW_INTERVAL:-180}
15+
16+
echo "OVN_REMOTE_PROBE_INTERVAL is set to $OVN_REMOTE_PROBE_INTERVAL"
17+
echo "OVN_REMOTE_OPENFLOW_INTERVAL is set to $OVN_REMOTE_OPENFLOW_INTERVAL"
18+
1319
# Check if config file exists, create default one if not
1420
if ! test -f "$CONFIG_FILE"; then
1521
mkdir -p $(dirname ${CONFIG_FILE})
@@ -45,8 +51,8 @@ ovn-ctl restart_controller
4551

4652
# Set remote ovn-sb for ovn-controller to connect to
4753
ovs-vsctl set open . external-ids:ovn-remote=tcp:"${OVN_SB_SERVICE_HOST}":"${OVN_SB_SERVICE_PORT}"
48-
ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
49-
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
54+
ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
55+
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
5056
ovs-vsctl set open . external-ids:ovn-encap-type=geneve
5157

5258
tail --follow=name --retry /var/log/openvswitch/ovs-vswitchd.log

‎dist/images/start-ovs.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
echo "OVN_REMOTE_PROBE_INTERVAL is set to $OVN_REMOTE_PROBE_INTERVAL"
5-
echo "OVN_REMOTE_OPENFLOW_INTERVAL is set to $OVN_REMOTE_OPENFLOW_INTERVAL"
4+
65

76
HW_OFFLOAD=${HW_OFFLOAD:-false}
87
ENABLE_SSL=${ENABLE_SSL:-false}
98
OVN_DB_IPS=${OVN_DB_IPS:-}
109
TUNNEL_TYPE=${TUNNEL_TYPE:-geneve}
1110
FLOW_LIMIT=${FLOW_LIMIT:-10}
1211
DEBUG_WRAPPER=${DEBUG_WRAPPER:-}
12+
OVN_REMOTE_PROBE_INTERVAL=${OVN_REMOTE_PROBE_INTERVAL:-10000}
13+
OVN_REMOTE_OPENFLOW_INTERVAL=${OVN_REMOTE_OPENFLOW_INTERVAL:-180}
14+
15+
echo "OVN_REMOTE_PROBE_INTERVAL is set to $OVN_REMOTE_PROBE_INTERVAL"
16+
echo "OVN_REMOTE_OPENFLOW_INTERVAL is set to $OVN_REMOTE_OPENFLOW_INTERVAL"
1317

1418
# Check required kernel module
1519
modinfo openvswitch
@@ -140,8 +144,8 @@ function gen_conn_str {
140144
}
141145
# Set remote ovn-sb for ovn-controller to connect to
142146
ovs-vsctl set open . external-ids:ovn-remote="$(gen_conn_str 6642)"
143-
ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
144-
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
147+
ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
148+
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
145149
ovs-vsctl set open . external-ids:ovn-encap-type="${TUNNEL_TYPE}"
146150
ovs-vsctl set open . external-ids:hostname="${KUBE_NODE_NAME}"
147151

‎yamls/ovn-dpdk.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@ spec:
364364
valueFrom:
365365
fieldRef:
366366
fieldPath: spec.nodeName
367+
- name: OVN_REMOTE_PROBE_INTERVAL
368+
value: "{{ .Values.networking.OVN_REMOTE_PROBE_INTERVAL }}"
369+
- name: OVN_REMOTE_OPENFLOW_INTERVAL
370+
value: "{{ .Values.networking.OVN_REMOTE_OPENFLOW_INTERVAL }}"
367371
volumeMounts:
368372
- mountPath: /lib/modules
369373
name: host-modules

0 commit comments

Comments
 (0)