Skip to content

Commit 0e4909a

Browse files
committed
Revert "enable set --ovn-northd-n-threads"
This reverts commit 9fd7ef5.
1 parent 9fd7ef5 commit 0e4909a

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

dist/images/start-db.sh

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER
77
echo "PROBE_INTERVAL is set to $PROBE_INTERVAL"
88
echo "OVN_LEADER_PROBE_INTERVAL is set to $OVN_LEADER_PROBE_INTERVAL"
99

10-
OVN_NORTHD_N_THREADS="4"
11-
echo "OVN_NORTHD_N_THREADS is set to $OVN_NORTHD_N_THREADS"
1210
# https://bugs.launchpad.net/neutron/+bug/1776778
1311
if grep -q "3.10.0-862" /proc/version
1412
then
@@ -277,7 +275,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
277275
--remote=db:Local_Config,Config,connections \
278276
/etc/ovn/ovnsb_local_config.db
279277
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
280-
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
278+
--ovn-manage-ovsdb=no start_northd
281279
ovn-nbctl --no-leader-only set NB_Global . options:inactivity_probe=${PROBE_INTERVAL}
282280
ovn-sbctl --no-leader-only set SB_Global . options:inactivity_probe=${PROBE_INTERVAL}
283281
ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
@@ -343,7 +341,6 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
343341
/usr/share/ovn/scripts/ovn-ctl \
344342
$ovn_ctl_args \
345343
--ovn-manage-ovsdb=no \
346-
--ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \
347344
start_northd
348345
fi
349346
fi
@@ -359,7 +356,6 @@ else
359356
--ovn-northd-ssl-key=/var/run/tls/key \
360357
--ovn-northd-ssl-cert=/var/run/tls/cert \
361358
--ovn-northd-ssl-ca-cert=/var/run/tls/cacert \
362-
--ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" \
363359
restart_northd
364360
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}"]
365361
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}
@@ -417,7 +413,7 @@ else
417413
--remote=db:Local_Config,Config,connections \
418414
/etc/ovn/ovnsb_local_config.db
419415
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
420-
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
416+
--ovn-manage-ovsdb=no start_northd
421417
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}
422418
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
423419
else
@@ -485,7 +481,7 @@ else
485481
--remote=db:Local_Config,Config,connections \
486482
/etc/ovn/ovnsb_local_config.db
487483
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
488-
--ovn-manage-ovsdb=no --ovn-northd-n-threads="${OVN_NORTHD_N_THREADS}" start_northd
484+
--ovn-manage-ovsdb=no start_northd
489485
fi
490486
fi
491487
fi

0 commit comments

Comments
 (0)