diff options
author | Ben Pfaff <blp@nicira.com> | 2009-09-09 10:50:32 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2009-09-09 10:50:32 -0700 |
commit | 8850d6d2d1bc3629627d7f70005c8fe08415c4f7 (patch) | |
tree | f5b819c08b74d00f82e18868a9fb762c1c9af519 | |
parent | 7983f00289c5b0d384ea99543d990d4f3d0d2639 (diff) |
Revert "xenserver: Renice netback process to priority 0 by default."
This reverts commit 641a0a4ed0a79d53a52d4e78ce1d90140a768798.
This is a crossport from master of commit b2cdfea by Ian Campbell, with
the following commit message:
Do not renice the netback thread.
We should increase the vswitchd daemon's priority instead.
-rwxr-xr-x | xenserver/etc_init.d_vswitch | 28 | ||||
-rw-r--r-- | xenserver/root_vswitch_scripts_sysconfig.template | 7 |
2 files changed, 0 insertions, 35 deletions
diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch index ee858fda..5eaac71b 100755 --- a/xenserver/etc_init.d_vswitch +++ b/xenserver/etc_init.d_vswitch @@ -34,7 +34,6 @@ VSWITCHD_CONF="${VSWITCHD_CONF:-/etc/ovs-vswitchd.conf}" VSWITCHD_PIDFILE="${VSWITCHD_PIDFILE:-/var/run/ovs-vswitchd.pid}" VSWITCHD_RUN_DIR="${VSWITCHD_RUN_DIR:-/var/xen/vswitch}" VSWITCHD_PRIORITY="${VSWITCHD_PRIORITY:--5}" -VSWITCHD_NETBACK_PRIORITY="${VSWITCHD_NETBACK_PRIORITY:-0}" VSWITCHD_LOGFILE="${VSWITCHD_LOGFILE:-/var/log/ovs-vswitchd.log}" VSWITCHD_FILE_LOGLEVEL="${VSWITCHD_FILE_LOGLEVEL:-}" VSWITCHD_SYSLOG_LOGLEVEL="${VSWITCHD_SYSLOG_LOGLEVEL:-WARN}" @@ -116,28 +115,6 @@ function reload_vswitchd { 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 { local syslog_opt="-vANY:SYSLOG:${VSWITCHD_SYSLOG_LOGLEVEL}" local logfile_file_opt="" @@ -175,11 +152,6 @@ function start_vswitchd { if [ "$ENABLE_FAKE_PROC_NET" = "y" ]; then fake_proc_net_opt="--fake-proc-net" 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 # Start in background and force a "success" message action "Starting ovs-vswitchd ($strace_opt$valgrind_opt)" true diff --git a/xenserver/root_vswitch_scripts_sysconfig.template b/xenserver/root_vswitch_scripts_sysconfig.template index 4bc4b190..295392ee 100644 --- a/xenserver/root_vswitch_scripts_sysconfig.template +++ b/xenserver/root_vswitch_scripts_sysconfig.template @@ -43,13 +43,6 @@ # processes. # 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=/var/log/ovs-vswitchd.log |