mirror of
https://github.com/openvswitch/ovs
synced 2025-09-03 15:55:19 +00:00
Do not renice the netback thread.
We should increase the vswitchd daemon's priority instead.
Reverts 641a0a4ed
This commit is contained in:
@@ -34,7 +34,6 @@ test -e /etc/sysconfig/vswitch && . /etc/sysconfig/vswitch
|
|||||||
: ${VSWITCHD_PIDFILE:=/var/run/ovs-vswitchd.pid}
|
: ${VSWITCHD_PIDFILE:=/var/run/ovs-vswitchd.pid}
|
||||||
: ${VSWITCHD_RUN_DIR:=/var/xen/vswitch}
|
: ${VSWITCHD_RUN_DIR:=/var/xen/vswitch}
|
||||||
: ${VSWITCHD_PRIORITY:=-5}
|
: ${VSWITCHD_PRIORITY:=-5}
|
||||||
: ${VSWITCHD_NETBACK_PRIORITY:=0}
|
|
||||||
: ${VSWITCHD_LOGFILE:=/var/log/ovs-vswitchd.log}
|
: ${VSWITCHD_LOGFILE:=/var/log/ovs-vswitchd.log}
|
||||||
: ${VSWITCHD_FILE_LOGLEVEL:=}
|
: ${VSWITCHD_FILE_LOGLEVEL:=}
|
||||||
: ${VSWITCHD_SYSLOG_LOGLEVEL:=WARN}
|
: ${VSWITCHD_SYSLOG_LOGLEVEL:=WARN}
|
||||||
@@ -113,28 +112,6 @@ function reload_vswitchd {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function quietly {
|
|
||||||
"$@" > /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
# renice_netback PRIORITY PID [PID...]
|
|
||||||
#
|
|
||||||
# Renices the netback processes given as each PID to nice level PRIORITY.
|
|
||||||
function renice_netback {
|
|
||||||
local pri=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
if test $# = 0; then
|
|
||||||
warning "Netback not running, nothing to renice"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
for pid
|
|
||||||
do
|
|
||||||
action "Renicing netback (pid $pid) to priority $pri" quietly renice $pri -p $pid
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
function start_vswitchd {
|
function start_vswitchd {
|
||||||
local syslog_opt="-vANY:SYSLOG:${VSWITCHD_SYSLOG_LOGLEVEL}"
|
local syslog_opt="-vANY:SYSLOG:${VSWITCHD_SYSLOG_LOGLEVEL}"
|
||||||
local logfile_file_opt=""
|
local logfile_file_opt=""
|
||||||
@@ -172,11 +149,6 @@ function start_vswitchd {
|
|||||||
if [ "$ENABLE_FAKE_PROC_NET" = "y" ]; then
|
if [ "$ENABLE_FAKE_PROC_NET" = "y" ]; then
|
||||||
fake_proc_net_opt="--fake-proc-net"
|
fake_proc_net_opt="--fake-proc-net"
|
||||||
fi
|
fi
|
||||||
if [ "$VSWITCHD_NETBACK_PRIORITY" != default ]; then
|
|
||||||
renice_netback $VSWITCHD_NETBACK_PRIORITY $(pidof netback)
|
|
||||||
else
|
|
||||||
warning "Netback renicing disabled (see /etc/sysconfig/vswitch)"
|
|
||||||
fi
|
|
||||||
if [ "$daemonize" != "y" ]; then
|
if [ "$daemonize" != "y" ]; then
|
||||||
# Start in background and force a "success" message
|
# Start in background and force a "success" message
|
||||||
action "Starting ovs-vswitchd ($strace_opt$valgrind_opt)" true
|
action "Starting ovs-vswitchd ($strace_opt$valgrind_opt)" true
|
||||||
|
@@ -43,13 +43,6 @@
|
|||||||
# processes.
|
# processes.
|
||||||
# VSWITCHD_PRIORITY=-5
|
# VSWITCHD_PRIORITY=-5
|
||||||
|
|
||||||
# VSWITCHD_NETBACK_PRIORITY: "nice" priority at which to run netback.
|
|
||||||
# It is a good idea to run ovs-vswitchd at a higher priority than
|
|
||||||
# netback to ensure that it gets enough CPU time to set up flows
|
|
||||||
# (bug #1656). Set this to 'default' to avoid changing netback's
|
|
||||||
# priority.
|
|
||||||
# VSWITCHD_NETBACK_PRIORITY=0
|
|
||||||
|
|
||||||
# VSWITCHD_LOGFILE: File to send the FILE_LOGLEVEL log messages to.
|
# VSWITCHD_LOGFILE: File to send the FILE_LOGLEVEL log messages to.
|
||||||
# VSWITCHD_LOGFILE=/var/log/ovs-vswitchd.log
|
# VSWITCHD_LOGFILE=/var/log/ovs-vswitchd.log
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user