ovs-ctl: do not attempt to restore flows when called with --delete-bridges
authorSimon Horman <simon.horman@netronome.com>
Thu, 20 Aug 2015 23:45:34 +0000 (16:45 -0700)
committerGurucharan Shetty <gshetty@nicira.com>
Fri, 21 Aug 2015 18:03:02 +0000 (11:03 -0700)
commit24605d4e58ff5d74845d9ae9339f723c0f13608f
tree023100e9cd714249c9fd6d50f4ac16fcf0d88e8e
parent6ca49d5ec1e29b0b12a47fe5ceee036074edc33d
ovs-ctl: do not attempt to restore flows when called with --delete-bridges

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 <simon.horman@netronome.com>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
utilities/ovs-ctl.in