Skip to content

Commit 188c252

Browse files
committed
enable set --ovn-northd-n-threads (#3150)
* enable set --ovn-northd-n-threads --------- Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
1 parent c5d4221 commit 188c252

File tree

6 files changed

+16
-3
lines changed

6 files changed

+16
-3
lines changed

charts/templates/central-deploy.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ spec:
7676
value: "{{ .Values.networking.PROBE_INTERVAL }}"
7777
- name: OVN_LEADER_PROBE_INTERVAL
7878
value: "{{ .Values.networking.OVN_LEADER_PROBE_INTERVAL }}"
79+
- name: OVN_NORTHD_N_THREADS
80+
value: "{{ .Values.networking.OVN_NORTHD_N_THREADS }}"
7981
resources:
8082
requests:
8183
cpu: {{ index .Values "ovn-central" "requests" "cpu" }}

charts/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ networking:
5151
OVN_LEADER_PROBE_INTERVAL: 5
5252
OVN_REMOTE_PROBE_INTERVAL: 10000
5353
OVN_REMOTE_OPENFLOW_INTERVAL: 180
54+
OVN_NORTHD_N_THREADS: 1
5455

5556
func:
5657
ENABLE_LB: true

dist/images/install.sh

+2
Original file line numberDiff line numberDiff line change
@@ -3236,6 +3236,8 @@ spec:
32363236
value: "180000"
32373237
- name: OVN_LEADER_PROBE_INTERVAL
32383238
value: "5"
3239+
- name: OVN_NORTHD_N_THREADS
3240+
value: "1"
32393241
resources:
32403242
requests:
32413243
cpu: 300m

dist/images/start-db.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
set -eo pipefail
33

44
DEBUG_WRAPPER=${DEBUG_WRAPPER:-}
5+
OVN_NORTHD_N_THREADS=${OVN_NORTHD_N_THREADS:-1}
56
DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER --ovsdb-sb-wrapper=$DEBUG_WRAPPER"
67

78
echo "PROBE_INTERVAL is set to $PROBE_INTERVAL"
89
echo "OVN_LEADER_PROBE_INTERVAL is set to $OVN_LEADER_PROBE_INTERVAL"
10+
echo "OVN_NORTHD_N_THREADS is set to $OVN_NORTHD_N_THREADS"
911

1012
# https://bugs.launchpad.net/neutron/+bug/1776778
1113
if grep -q "3.10.0-862" /proc/version
@@ -275,7 +277,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
275277
--remote=db:Local_Config,Config,connections \
276278
/etc/ovn/ovnsb_local_config.db
277279
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
278-
--ovn-manage-ovsdb=no start_northd
280+
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
279281
ovn-nbctl --no-leader-only set NB_Global . options:inactivity_probe=${PROBE_INTERVAL}
280282
ovn-sbctl --no-leader-only set SB_Global . options:inactivity_probe=${PROBE_INTERVAL}
281283
ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
@@ -341,6 +343,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
341343
/usr/share/ovn/scripts/ovn-ctl \
342344
$ovn_ctl_args \
343345
--ovn-manage-ovsdb=no \
346+
--ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \
344347
start_northd
345348
fi
346349
fi
@@ -356,6 +359,7 @@ else
356359
--ovn-northd-ssl-key=/var/run/tls/key \
357360
--ovn-northd-ssl-cert=/var/run/tls/cert \
358361
--ovn-northd-ssl-ca-cert=/var/run/tls/cacert \
362+
--ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \
359363
restart_northd
360364
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:"${NB_PORT}":["${DB_ADDR}"]
361365
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=${PROBE_INTERVAL}
@@ -413,7 +417,7 @@ else
413417
--remote=db:Local_Config,Config,connections \
414418
/etc/ovn/ovnsb_local_config.db
415419
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
416-
--ovn-manage-ovsdb=no start_northd
420+
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
417421
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
418422
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:use_logical_dp_groups=true
419423
else
@@ -481,7 +485,7 @@ else
481485
--remote=db:Local_Config,Config,connections \
482486
/etc/ovn/ovnsb_local_config.db
483487
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
484-
--ovn-manage-ovsdb=no start_northd
488+
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
485489
fi
486490
fi
487491
fi

yamls/ovn-dpdk.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ spec:
236236
value: "180000"
237237
- name: OVN_LEADER_PROBE_INTERVAL
238238
value: "5"
239+
- name: OVN_NORTHD_N_THREADS
240+
value: "1"
239241
resources:
240242
requests:
241243
cpu: 500m

yamls/ovn-ha.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ spec:
127127
value: "180000"
128128
- name: OVN_LEADER_PROBE_INTERVAL
129129
value: "5"
130+
- name: OVN_NORTHD_N_THREADS
131+
value: "1"
130132
resources:
131133
requests:
132134
cpu: 300m

0 commit comments

Comments
 (0)