diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-08-12 10:18:19 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-08-12 11:15:20 -0700 |
| commit | 2cc906419fd8592c24a281a2c4b0932ad978be3d (patch) | |
| tree | d5b8bd0a1474d83e4ec45a187b3d5bd875a4b13c /debian | |
| parent | df5d2ed998115b4aace007508e0cc374f5f84ab5 (diff) | |
Wait for daemons to die in init.d script "stop" commands.
Sometimes it takes a moment for the OVS daemons to die. When that happens,
the "start" half of "openvswitch restart" can fail when ovsdb-tool
runs, because ovsdb-server will still have the lock on the database if it
has not exited yet. So this commit just makes the "stop" half wait for
the daemons to really die.
Bug #3369.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/openvswitch-switch.init | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index a5b6857e..a933a21a 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -273,13 +273,13 @@ case "$1" in ;; stop) echo -n "Stopping ovs-vswitchd: " - start-stop-daemon --stop --quiet --oknodo \ + start-stop-daemon --stop --quiet --oknodo --retry 5 \ --pidfile /var/run/openvswitch/ovs-vswitchd.pid \ --exec $ovs_vswitchd echo "ovs-vswitchd." echo -n "Stopping ovsdb-server: " - start-stop-daemon --stop --quiet --oknodo \ + start-stop-daemon --stop --quiet --oknodo --retry 5 \ --pidfile /var/run/openvswitch/ovsdb-server.pid \ --exec $ovsdb_server echo "ovsdb-server." |