Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable set --ovn-northd-n-threads #3150

Merged
merged 2 commits into from
Aug 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions charts/templates/central-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ spec:
value: "{{ .Values.networking.PROBE_INTERVAL }}"
- name: OVN_LEADER_PROBE_INTERVAL
value: "{{ .Values.networking.OVN_LEADER_PROBE_INTERVAL }}"
- name: OVN_NORTHD_N_THREADS
value: "{{ .Values.networking.OVN_NORTHD_N_THREADS }}"
resources:
requests:
cpu: {{ index .Values "ovn-central" "requests" "cpu" }}
Expand Down
1 change: 1 addition & 0 deletions charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ networking:
OVN_LEADER_PROBE_INTERVAL: 5
OVN_REMOTE_PROBE_INTERVAL: 10000
OVN_REMOTE_OPENFLOW_INTERVAL: 180
OVN_NORTHD_N_THREADS: 1

func:
ENABLE_LB: true
Expand Down
2 changes: 2 additions & 0 deletions dist/images/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3238,6 +3238,8 @@ spec:
value: "180000"
- name: OVN_LEADER_PROBE_INTERVAL
value: "5"
- name: OVN_NORTHD_N_THREADS
value: "1"
resources:
requests:
cpu: 300m
Expand Down
10 changes: 7 additions & 3 deletions dist/images/start-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
set -eo pipefail

DEBUG_WRAPPER=${DEBUG_WRAPPER:-}
OVN_NORTHD_N_THREADS=${OVN_NORTHD_N_THREADS:-1}
DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER --ovsdb-sb-wrapper=$DEBUG_WRAPPER"

echo "PROBE_INTERVAL is set to $PROBE_INTERVAL"
echo "OVN_LEADER_PROBE_INTERVAL is set to $OVN_LEADER_PROBE_INTERVAL"
echo "OVN_NORTHD_N_THREADS is set to $OVN_NORTHD_N_THREADS"
bobz965 marked this conversation as resolved.
Show resolved Hide resolved

# https://bugs.launchpad.net/neutron/+bug/1776778
if grep -q "3.10.0-862" /proc/version
Expand Down Expand Up @@ -275,7 +277,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
--remote=db:Local_Config,Config,connections \
/etc/ovn/ovnsb_local_config.db
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
--ovn-manage-ovsdb=no start_northd
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
ovn-nbctl --no-leader-only set NB_Global . options:inactivity_probe=${PROBE_INTERVAL}
ovn-sbctl --no-leader-only set SB_Global . options:inactivity_probe=${PROBE_INTERVAL}
ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
Expand Down Expand Up @@ -341,6 +343,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
/usr/share/ovn/scripts/ovn-ctl \
$ovn_ctl_args \
--ovn-manage-ovsdb=no \
--ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \
start_northd
fi
fi
Expand All @@ -356,6 +359,7 @@ else
--ovn-northd-ssl-key=/var/run/tls/key \
--ovn-northd-ssl-cert=/var/run/tls/cert \
--ovn-northd-ssl-ca-cert=/var/run/tls/cacert \
--ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \
restart_northd
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}"]
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}
Expand Down Expand Up @@ -413,7 +417,7 @@ else
--remote=db:Local_Config,Config,connections \
/etc/ovn/ovnsb_local_config.db
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
--ovn-manage-ovsdb=no start_northd
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
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}
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
else
Expand Down Expand Up @@ -481,7 +485,7 @@ else
--remote=db:Local_Config,Config,connections \
/etc/ovn/ovnsb_local_config.db
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
--ovn-manage-ovsdb=no start_northd
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
fi
fi
fi
Expand Down
2 changes: 2 additions & 0 deletions yamls/ovn-dpdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ spec:
value: "180000"
- name: OVN_LEADER_PROBE_INTERVAL
value: "5"
- name: OVN_NORTHD_N_THREADS
value: "1"
resources:
requests:
cpu: 500m
Expand Down
2 changes: 2 additions & 0 deletions yamls/ovn-ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ spec:
value: "180000"
- name: OVN_LEADER_PROBE_INTERVAL
value: "5"
- name: OVN_NORTHD_N_THREADS
value: "1"
resources:
requests:
cpu: 300m
Expand Down
Loading