Currently we are adding the manager after starting ovs-vswitchd.
Instead, add the manager after flow restore is completed.
Bug #16086.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
+add_managers () {
+ # Now that ovs-vswitchd has started and completed its initial
+ # configuration, tell ovsdb-server to conenct 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.)
+ action "Enabling remote OVSDB managers" \
+ ovs-appctl -t ovsdb-server ovsdb-server/add-remote \
+ db:Open_vSwitch,Open_vSwitch,manager_options
+}
+
start_forwarding () {
check_force_cores
start_forwarding () {
check_force_cores
fi
start_daemon "$OVS_VSWITCHD_PRIORITY" "$OVS_VSWITCHD_WRAPPER" "$@"
fi
fi
start_daemon "$OVS_VSWITCHD_PRIORITY" "$OVS_VSWITCHD_WRAPPER" "$@"
fi
-
- # Now that ovs-vswitchd has started and completed its initial
- # configuration, tell ovsdb-server to conenct 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.)
- action "Enabling remote OVSDB managers" \
- ovs-appctl -t ovsdb-server ovsdb-server/add-remote \
- db:Open_vSwitch,Open_vSwitch,manager_options
else
log_warning_msg "Failed to save configuration, not replacing kernel module"
start_forwarding
else
log_warning_msg "Failed to save configuration, not replacing kernel module"
start_forwarding
exit 1
fi
chmod +x "$script_interfaces"
exit 1
fi
chmod +x "$script_interfaces"
start_forwarding
restore_flows
start_forwarding
restore_flows
# Restore the saved flows.
restore_flows
# Restore the saved flows.
restore_flows
# Restore the interfaces if required. Return true even if restore fails.
restore_interfaces || true
# Restore the interfaces if required. Return true even if restore fails.
restore_interfaces || true
start)
start_ovsdb
start_forwarding
start)
start_ovsdb
start_forwarding