On Thu, Aug 20, 2015 at 4:45 PM, Simon Horman
<[email protected]> wrote:
> When called with --delete-bridges saved flows cannot be restored as the
> bridges to which they belong no longer exist. This results in the following
> error messages on restart.
>
> ovs-ofctl: br0 is not a bridge or a socket
> Restoring saved flows ... failed!
>
> Although there is no effect of this error other than the message
> it seems worth avoiding. This patch does so by skipping saving of flows
> when --delete-bridges is in effect.
>
> As flows are no longer saved when --delete-bridges is in effect
> a side-effect of this change is that restart may be faster when
> there are many flows.
>
> Signed-off-by: Simon Horman <[email protected]>
Acked-by: Gurucharan Shetty <[email protected]>
(I will apply this in a few hours, if no one else has any comments)
> ---
> utilities/ovs-ctl.in | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
> index 99d789c68b0a..918be2c9c188 100755
> --- a/utilities/ovs-ctl.in
> +++ b/utilities/ovs-ctl.in
> @@ -322,6 +322,12 @@ save_ofports_if_required () {
> esac
> }
>
> +save_flows_if_required () {
> + if test X"$DELETE_BRIDGES" != Xyes; then
> + action "Saving flows" ovs_save save-flows "${script_flows}"
> + fi
> +}
> +
> save_interfaces () {
> "$datadir/scripts/ovs-save" save-interfaces ${ifaces} \
> > "${script_interfaces}"
> @@ -372,9 +378,7 @@ force_reload_kmod () {
> action "Detected internal interfaces: $ifaces" true
>
> init_restore_scripts
> -
> - action "Saving flows" ovs_save save-flows "${script_flows}"
> -
> + save_flows_if_required
> save_ofports_if_required
>
> # Restart the database first, since a large database may take a
> @@ -450,7 +454,7 @@ restart () {
> if daemon_is_running ovsdb-server && daemon_is_running ovs-vswitchd; then
> init_restore_scripts
> save_interfaces_if_required
> - action "Saving flows" ovs_save save-flows "${script_flows}"
> + save_flows_if_required
> save_ofports_if_required
> fi
>
> --
> 2.1.4
>
> _______________________________________________
> dev mailing list
> [email protected]
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
