# let some servers to die gracefully and
# 'restart' will not work
-# Include ovs-openflowd defaults if available
+# Include openvswitch-switch defaults if available
unset OVSDB_SERVER_OPTS
unset OVS_VSWITCHD_OPTS
unset CORE_LIMIT
[ ! -f "$pidfile" ] && return
if running $name; then
kill $pid
- [ -n "$DODTIME" ] && sleep "$DODTIME"s
+ [ -n "$DODTIME" ] && sleep "$DODTIME"
if running $name; then
kill -KILL $pid
- [ -n "$DODTIME" ] && sleep "$DODTIME"s
+ [ -n "$DODTIME" ] && sleep "$DODTIME"
if running $name; then
echo "Cannot kill $name (pid=$pid)!"
exit 1
echo "For instructions, read"
echo "/usr/share/doc/openvswitch-datapath-source/README.Debian"
fi
- exit 1
+ exit 0
fi
}
unload_module openvswitch_mod
}
+set_system_info() {
+ ovs_version=`ovs-vswitchd --version | sed 's/.*) //;1q'`
+ ovs-vsctl --no-wait --timeout=5 set Open_vSwitch . \
+ ovs-version="$ovs_version"
+
+ if (lsb_release --id) >/dev/null 2>&1; then
+ system_type=`lsb_release --id -s`
+ system_release=`lsb_release --release -s`
+ system_codename=`lsb_release --codename -s`
+ system_version="${system_release}-${system_codename}"
+
+ ovs-vsctl --no-wait --timeout=5 set Open_vSwitch . \
+ system-type="$system_type" \
+ system-version="$system_version"
+ fi
+}
+
case "$1" in
start)
+ conf_file=/etc/openvswitch/conf.db
+ schema_file=/usr/share/openvswitch/vswitch.ovsschema
+ schema_ver=`ovsdb-tool schema-version "$schema_file"`
+
load_module openvswitch_mod
if test -n "$CORE_LIMIT"; then
fi
# Create an empty configuration database if it doesn't exist.
- if test ! -e /etc/openvswitch/conf.db; then
- install -d -m 755 -o root -g root /etc/openvswitch
-
+ if test ! -e $conf_file; then
# Create configuration database.
- ovsdb-tool -vANY:console:emer \
- create /etc/openvswitch/conf.db \
- /usr/share/openvswitch/vswitch.ovsschema
- else
+ ovsdb-tool -vANY:console:emer create $conf_file $schema_file
+ elif test "X`ovsdb-tool needs-conversion $conf_file $schema_file`" != Xno; then
+ # Back up the old version.
+ version=`ovsdb-tool db-version "$conf_file"`
+ cksum=`ovsdb-tool db-cksum "$conf_file" | awk '{print $1}'`
+ cp "$conf_file" "$conf_file.backup$version-$cksum"
+
+ # Compact database. This is important if the old schema did not
+ # enable garbage collection (i.e. if it did not have any tables
+ # with "isRoot": true) but the new schema does. In that situation
+ # the old database may contain a transaction that creates a record
+ # followed by a transaction that creates the first use of the
+ # record. Replaying that series of transactions against the new
+ # database schema (as "convert" does) would cause the record to be
+ # dropped by the first transaction, then the second transaction
+ # would cause a referential integrity failure (for a strong
+ # reference).
+ ovsdb-tool -vANY:console:emer compact $conf_file
+
# Upgrade or downgrade schema and compact database.
- ovsdb-tool -vANY:console:emer \
- convert /etc/openvswitch/conf.db \
- /usr/share/openvswitch/vswitch.ovsschema
+ ovsdb-tool -vANY:console:emer convert $conf_file $schema_file
fi
if test "$ENABLE_MONITOR" = y; then
install -d -m 755 -o root -g root /var/log/openvswitch
fi
+ if [ ! -d /var/log/openvswitch/cores ]; then
+ install -d -m 755 -o root -g root /var/log/openvswitch/cores
+ fi
+
# Start ovsdb-server.
set --
- set -- "$@" /etc/openvswitch/conf.db
+ set -- "$@" $conf_file
set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err
set -- "$@" --log-file=/var/log/openvswitch/ovsdb-server.log
- set -- "$@" --detach --pidfile $monitor_opt
+ set -- "$@" --detach --no-chdir --pidfile $monitor_opt
set -- "$@" --remote punix:/var/run/openvswitch/db.sock
- set -- "$@" --remote db:Open_vSwitch,managers
+ 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
set -- "$@" $OVSDB_SERVER_OPTS
echo -n "Starting ovsdb-server: "
- start-stop-daemon --start --quiet \
+ start-stop-daemon --start --quiet --oknodo \
--pidfile /var/run/openvswitch/ovsdb-server.pid \
+ --chdir /var/log/openvswitch/cores \
--exec $ovsdb_server -- "$@"
if running ovsdb-server; then
echo "ovsdb-server."
echo " ERROR."
fi
- ovs-vsctl --no-wait init
+ ovs-vsctl --no-wait --timeout=5 init -- set Open_vSwitch . db-version="$schema_ver"
+
+ set_system_info
# Start ovs-vswitchd.
set --
set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err
set -- "$@" --log-file=/var/log/openvswitch/ovs-vswitchd.log
- set -- "$@" --detach --pidfile $monitor_opt
+ set -- "$@" --detach --no-chdir --pidfile $monitor_opt
set -- "$@" unix:/var/run/openvswitch/db.sock
set -- "$@" $OVS_VSWITCHD_OPTS
echo -n "Starting ovs-vswitchd: "
- start-stop-daemon --start --quiet \
+ start-stop-daemon --start --quiet --oknodo \
--pidfile /var/run/openvswitch/ovs-vswitchd.pid \
+ --chdir /var/log/openvswitch/cores \
--exec $ovs_vswitchd -- "$@"
if running ovs-vswitchd; then
echo "ovs-vswitchd."
echo -n "Stopping ovs-vswitchd: "
start-stop-daemon --stop --quiet --oknodo --retry 5 \
--pidfile /var/run/openvswitch/ovs-vswitchd.pid \
+ --chdir /var/log/openvswitch/cores \
--exec $ovs_vswitchd
echo "ovs-vswitchd."
echo -n "Stopping ovsdb-server: "
start-stop-daemon --stop --quiet --oknodo --retry 5 \
--pidfile /var/run/openvswitch/ovsdb-server.pid \
+ --chdir /var/log/openvswitch/cores \
--exec $ovsdb_server
echo "ovsdb-server."
;;
if running $daemon; then
echo "running"
else
- echo " not running."
+ echo "not running."
exit 1
fi
done
git://git.onelab.eu / sliver-openvswitch.git / blobdiff