|
2 | 2 | set -eo pipefail
|
3 | 3 |
|
4 | 4 | DEBUG_WRAPPER=${DEBUG_WRAPPER:-}
|
| 5 | +OVN_NORTHD_N_THREADS=${OVN_NORTHD_N_THREADS:-1} |
5 | 6 | DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER --ovsdb-sb-wrapper=$DEBUG_WRAPPER"
|
6 | 7 |
|
7 | 8 | echo "PROBE_INTERVAL is set to $PROBE_INTERVAL"
|
8 | 9 | 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" |
9 | 11 |
|
10 | 12 | # https://bugs.launchpad.net/neutron/+bug/1776778
|
11 | 13 | if grep -q "3.10.0-862" /proc/version
|
@@ -275,7 +277,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
|
275 | 277 | --remote=db:Local_Config,Config,connections \
|
276 | 278 | /etc/ovn/ovnsb_local_config.db
|
277 | 279 | /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 |
279 | 281 | ovn-nbctl --no-leader-only set NB_Global . options:inactivity_probe=${PROBE_INTERVAL}
|
280 | 282 | ovn-sbctl --no-leader-only set SB_Global . options:inactivity_probe=${PROBE_INTERVAL}
|
281 | 283 | ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
|
@@ -341,6 +343,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
|
341 | 343 | /usr/share/ovn/scripts/ovn-ctl \
|
342 | 344 | $ovn_ctl_args \
|
343 | 345 | --ovn-manage-ovsdb=no \
|
| 346 | + --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \ |
344 | 347 | start_northd
|
345 | 348 | fi
|
346 | 349 | fi
|
|
356 | 359 | --ovn-northd-ssl-key=/var/run/tls/key \
|
357 | 360 | --ovn-northd-ssl-cert=/var/run/tls/cert \
|
358 | 361 | --ovn-northd-ssl-ca-cert=/var/run/tls/cacert \
|
| 362 | + --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \ |
359 | 363 | restart_northd
|
360 | 364 | 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}"]
|
361 | 365 | 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 | 417 | --remote=db:Local_Config,Config,connections \
|
414 | 418 | /etc/ovn/ovnsb_local_config.db
|
415 | 419 | /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 |
417 | 421 | 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}
|
418 | 422 | 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
|
419 | 423 | else
|
|
481 | 485 | --remote=db:Local_Config,Config,connections \
|
482 | 486 | /etc/ovn/ovnsb_local_config.db
|
483 | 487 | /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 |
485 | 489 | fi
|
486 | 490 | fi
|
487 | 491 | fi
|
|
0 commit comments