git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ofctl: Fix a typo in documentation.
[sliver-openvswitch.git]
/
utilities
/
ovs-ctl.in
diff --git
a/utilities/ovs-ctl.in
b/utilities/ovs-ctl.in
index
fb33f72
..
0735160
100755
(executable)
--- a/
utilities/ovs-ctl.in
+++ b/
utilities/ovs-ctl.in
@@
-224,10
+224,10
@@
start_forwarding () {
log_success_msg "ovs-vswitchd is already running"
else
# Increase the limit on the number of open file descriptors.
log_success_msg "ovs-vswitchd is already running"
else
# Increase the limit on the number of open file descriptors.
- # On Linux, ovs-vswitchd needs about
one file descriptor per
- #
switch port, so this allows a very large number of switch
- # ports.
- ulimit -n
50
00
+ # On Linux, ovs-vswitchd needs about
three file descriptors
+ #
per bridge and one file descriptor per bridge port, so this
+ #
allows a very large number of bridges and
ports.
+ ulimit -n
75
00
# Start ovs-vswitchd.
set ovs-vswitchd unix:"$DB_SOCK"
# Start ovs-vswitchd.
set ovs-vswitchd unix:"$DB_SOCK"
@@
-306,6
+306,15
@@
restore_ofports () {
action "Restoring ofport values" "${script_ofports}"
}
action "Restoring ofport values" "${script_ofports}"
}
+flow_restore_wait () {
+ ovs_vsctl set open_vswitch . other_config:flow-restore-wait="true"
+}
+
+flow_restore_complete () {
+ ovs_vsctl --if-exists remove open_vswitch . other_config \
+ flow-restore-wait="true"
+}
+
restore_flows () {
[ -x "${script_flows}" ] && \
action "Restoring saved flows" "${script_flows}"
restore_flows () {
[ -x "${script_flows}" ] && \
action "Restoring saved flows" "${script_flows}"
@@
-373,9
+382,13
@@
force_reload_kmod () {
action "Removing openvswitch module" rmmod openvswitch
fi
action "Removing openvswitch module" rmmod openvswitch
fi
+ # Start vswitchd by asking it to wait till flow restore is finished.
+ flow_restore_wait
start_forwarding
start_forwarding
+ # Restore saved flows and inform vswitchd that we are done.
restore_flows
restore_flows
+ flow_restore_complete
add_managers
restore_interfaces
add_managers
restore_interfaces
@@
-418,10
+431,14
@@
restart () {
restore_ofports
stop_forwarding
restore_ofports
stop_forwarding
+
+ # Start vswitchd by asking it to wait till flow restore is finished.
+ flow_restore_wait
start_forwarding
start_forwarding
- # Restore
the saved flows
.
+ # Restore
saved flows and inform vswitchd that we are done
.
restore_flows
restore_flows
+ flow_restore_complete
add_managers
# Restore the interfaces if required. Return true even if restore fails.
add_managers
# Restore the interfaces if required. Return true even if restore fails.