I sent a V2 On Thu, Sep 6, 2018 at 4:30 PM, Darrell Ball <[email protected]> wrote:
> 'add_managers ()' is filtering add-remote if vswitchd is not started. > However, if we actually filter here we end up with a bricked system, > blackholing all traffic. Allowing add_manager() to proceed may mean > extra churn in controllers in some cases, but this is far better than > the alternative of a bricked system. > > Signed-off-by: Darrell Ball <[email protected]> > --- > utilities/ovs-ctl.in | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > mode change 100755 => 100644 utilities/ovs-ctl.in > > diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in > old mode 100755 > new mode 100644 > index 43c8f32..b7a0d9b > --- a/utilities/ovs-ctl.in > +++ b/utilities/ovs-ctl.in > @@ -165,15 +165,15 @@ start_ovsdb() { > > add_managers () { > # Now that ovs-vswitchd has started and completed its initial > - # configuration, tell ovsdb-server to connect to the remote > managers. We > - # used to do this at ovsdb-server startup time, but waiting for > - # ovs-vswitchd to finish configuring means that remote managers see > less > - # churn in the database at startup or restart. (For example, managers > - # won't briefly see empty datapath-id or ofport columns for records > that > - # exist at startup.) > + # configuration, tell ovsdb-server to connect to the remote managers. > + # If ovs-vswitchd is not finished configuring, it may mean that remote > + # managers will see more churn in the database at startup or restart. > + # (For example, managers may briefly see empty datapath-id or ofport > + # columns for records that exist at startup.). However, the > + # alternative is a 'bricked' system, so we allow database connectivity > + # regardless. > if test X"$OVSDB_SERVER" = Xyes || test X"$OVS_VSWITCHD" = Xyes; then > - if daemon_is_running ovsdb-server \ > - && daemon_is_running ovs-vswitchd; then > + if daemon_is_running ovsdb-server; then > action "Enabling remote OVSDB managers" \ > ovs-appctl -t ovsdb-server ovsdb-server/add-remote \ > db:Open_vSwitch,Open_vSwitch,manager_options > -- > 1.9.1 > > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
