X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ctl.in;h=674c3c31e5c7e302a35b9876d2afdd32972dcaed;hb=a6f639f8080fe18120bb205609c6e364f6de7e70;hp=ed558346cdee00e37cd5610b9265c040352a6afa;hpb=8a07709cb80462edb32fc11d056bfc08ce90f62d;p=sliver-openvswitch.git diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index ed558346c..674c3c31e 100755 --- a/utilities/ovs-ctl.in +++ b/utilities/ovs-ctl.in @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc. +# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -64,7 +64,12 @@ insert_brcompat_mod_if_required () { insert_mod_if_required () { insert_openvswitch_mod_if_required || return 1 if test X"$BRCOMPAT" = Xyes; then - insert_brcompat_mod_if_required || return 1 + if insert_brcompat_mod_if_required; then + : + else + log_warning_msg "could not load brcompat module, disabling bridge compatibility" + BRCOMPAT=no + fi fi } @@ -73,7 +78,7 @@ ovs_vsctl () { } ovsdb_tool () { - ovsdb-tool -vANY:console:off "$@" + ovsdb-tool -vconsole:off "$@" } create_db () { @@ -167,63 +172,72 @@ set_system_ids () { action "Configuring Open vSwitch system IDs" "$@" $extra_ids } -start () { +check_force_cores () { if test X"$FORCE_COREFILES" = Xyes; then ulimit -Sc 67108864 fi +} - insert_mod_if_required || return 1 +start_ovsdb () { + check_force_cores if daemon_is_running ovsdb-server; then - log_success_msg "ovsdb-server is already running" + log_success_msg "ovsdb-server is already running" else - # Create initial database or upgrade database schema. - upgrade_db || return 1 - - # Start ovsdb-server. - set ovsdb-server "$DB_FILE" - set "$@" -vANY:CONSOLE:EMER -vANY:SYSLOG:ERR -vANY:FILE:INFO - set "$@" --remote=punix:"$DB_SOCK" - set "$@" --remote=db:Open_vSwitch,manager_options - set "$@" --private-key=db:SSL,private_key - set "$@" --certificate=db:SSL,certificate - set "$@" --bootstrap-ca-cert=db:SSL,ca_cert - start_daemon "$OVSDB_SERVER_PRIORITY" "$@" || return 1 - - # Initialize database settings. - ovs_vsctl -- init -- set Open_vSwitch . db-version="$schemaver" \ - || return 1 - set_system_ids || return 1 - if test X"$DELETE_BRIDGES" = Xyes; then + # Create initial database or upgrade database schema. + upgrade_db || return 1 + + # Start ovsdb-server. + set ovsdb-server "$DB_FILE" + set "$@" -vconsole:emer -vsyslog:err -vfile:info + set "$@" --remote=punix:"$DB_SOCK" + set "$@" --remote=db:Open_vSwitch,manager_options + set "$@" --private-key=db:SSL,private_key + set "$@" --certificate=db:SSL,certificate + set "$@" --bootstrap-ca-cert=db:SSL,ca_cert + start_daemon "$OVSDB_SERVER_PRIORITY" "$OVSDB_SERVER_WRAPPER" "$@" \ + || return 1 + + # Initialize database settings. + ovs_vsctl -- init -- set Open_vSwitch . db-version="$schemaver" \ + || return 1 + set_system_ids || return 1 + if test X"$DELETE_BRIDGES" = Xyes; then for bridge in `ovs_vsctl list-br`; do - ovs_vsctl del-br $bridge + ovs_vsctl del-br $bridge done - fi + fi fi +} + +start_forwarding () { + check_force_cores + + insert_mod_if_required || return 1 if daemon_is_running ovs-vswitchd; then - log_success_msg "ovs-vswitchd is already running" + log_success_msg "ovs-vswitchd is already running" else - # Increase the limit on the number of open file descriptors. - # ovs-vswitchd needs 16 per datapath, plus a few extra, so this - # should allow for 256 (or more) bridges. - ulimit -n 5000 - - # Start ovs-vswitchd. - set ovs-vswitchd unix:"$DB_SOCK" - set "$@" -vANY:CONSOLE:EMER -vANY:SYSLOG:ERR -vANY:FILE:INFO - if test X"$MLOCKALL" != Xno; then - set "$@" --mlockall - fi - start_daemon "$OVS_VSWITCHD_PRIORITY" "$@" + # Increase the limit on the number of open file descriptors. + # ovs-vswitchd needs 16 per datapath, plus a few extra, so this + # should allow for 256 (or more) bridges. + ulimit -n 5000 + + # Start ovs-vswitchd. + set ovs-vswitchd unix:"$DB_SOCK" + set "$@" -vconsole:emer -vsyslog:err -vfile:info + if test X"$MLOCKALL" != Xno; then + set "$@" --mlockall + fi + start_daemon "$OVS_VSWITCHD_PRIORITY" "$OVS_VSWITCHD_WRAPPER" "$@" fi if daemon_is_running ovs-brcompatd; then - log_success_msg "ovs-brcompatd is already running" + log_success_msg "ovs-brcompatd is already running" elif test X"$BRCOMPAT" = Xyes; then set ovs-brcompatd - set "$@" -vANY:CONSOLE:EMER -vANY:SYSLOG:ERR -vANY:FILE:INFO - start_daemon "$OVS_BRCOMPATD_PRIORITY" "$@" + set "$@" -vconsole:emer -vsyslog:err -vfile:info + start_daemon "$OVS_BRCOMPATD_PRIORITY" "$OVS_BRCOMPATD_WRAPPER" "$@" fi } @@ -231,10 +245,13 @@ start () { ## stop ## ## ---- ## -stop () { +stop_ovsdb () { + stop_daemon ovsdb-server +} + +stop_forwarding () { stop_daemon ovs-brcompatd stop_daemon ovs-vswitchd - stop_daemon ovsdb-server } ## ----------------- ## @@ -254,11 +271,11 @@ internal_interfaces () { # But ignore interfaces that don't really exist. for d in `(ovs_vsctl --bare \ -- --columns=name find Interface type=internal \ - -- list-br) | sort -u` + -- list-br) | sort -u` do if test -e "/sys/class/net/$d"; then - printf "%s " "$d" - fi + printf "%s " "$d" + fi done } @@ -270,7 +287,12 @@ force_reload_kmod () { ifaces=`internal_interfaces` action "Detected internal interfaces: $ifaces" true - stop + # Restart the database first, since a large database may take a + # while to load, and we want to minimize forwarding disruption. + stop_ovsdb + start_ovsdb + + stop_forwarding script=`mktemp` trap 'rm -f "$script"' 0 1 2 13 15 @@ -278,7 +300,7 @@ force_reload_kmod () { : else log_warning_msg "Failed to save configuration, not replacing kernel module" - start + start_forwarding exit 1 fi chmod +x "$script" @@ -299,7 +321,7 @@ force_reload_kmod () { action "Removing openvswitch module" rmmod openvswitch fi - start + start_forwarding action "Restoring interface configuration" "$script" rc=$? @@ -311,6 +333,8 @@ force_reload_kmod () { log="logger -p daemon.$level -t ovs-save" $log "force-reload-kmod interface restore script exited with status $rc:" $log -f "$script" + + "$datadir/scripts/ovs-check-dead-ifs" } ## --------------- ## @@ -375,8 +399,11 @@ set_defaults () { OVSDB_SERVER_PRIORITY=-10 OVS_VSWITCHD_PRIORITY=-10 OVS_BRCOMPATD_PRIORITY=-10 + OVSDB_SERVER_WRAPPER= + OVS_VSWITCHD_WRAPPER= + OVS_BRCOMPATD_WRAPPER= - DB_FILE=$etcdir/conf.db + DB_FILE=$dbdir/conf.db DB_SOCK=$rundir/db.sock DB_SCHEMA=$datadir/vswitch.ovsschema @@ -440,6 +467,12 @@ Less important options for "start" and "force-reload-kmod": --ovs-vswitchd-priority=NICE set ovs-vswitchd's niceness (default: $OVS_VSWITCHD_PRIORITY) --ovs-brcompatd-priority=NICE set ovs-brcompatd's niceness (default: $OVS_BRCOMPATD_PRIORITY) +Debugging options for "start" and "force-reload-kmod": + --ovsdb-server-wrapper=WRAPPER + --ovs-vswitchd-wrapper=WRAPPER + --ovs-vswitchd-wrapper=WRAPPER + run specified daemon under WRAPPER (either 'valgrind' or 'strace') + Options for "start", "force-reload-kmod", "load-kmod", "status", and "version": --brcompat enable Linux bridge compatibility module and daemon @@ -458,8 +491,9 @@ Other options: -V, --version display version information Default directories with "configure" option and environment variable override: - logs: @LOGDIR@ (--log-dir, OVS_LOGDIR) - pidfiles and sockets: @RUNDIR@ (--run-dir, OVS_RUNDIR) + logs: @LOGDIR@ (--with-logdir, OVS_LOGDIR) + pidfiles and sockets: @RUNDIR@ (--with-rundir, OVS_RUNDIR) + conf.db: @DBDIR@ (--with-dbdir, OVS_DBDIR) system configuration: @sysconfdir@ (--sysconfdir, OVS_SYSCONFDIR) data files: @pkgdatadir@ (--pkgdatadir, OVS_PKGDATADIR) user binaries: @bindir@ (--bindir, OVS_BINDIR) @@ -550,10 +584,12 @@ do done case $command in start) - start + start_ovsdb + start_forwarding ;; stop) - stop + stop_forwarding + stop_ovsdb ;; status) rc=0 @@ -568,7 +604,7 @@ case $command in done ;; force-reload-kmod) - force_reload_kmod + force_reload_kmod ;; load-kmod) insert_mod_if_required