summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZak Whittington <zwhitt.vmware@gmail.com>2018-11-02 15:25:29 -0700
committerBen Pfaff <blp@ovn.org>2018-11-02 16:17:33 -0700
commitdf514c62b6685bda925afab6b5857b2067517354 (patch)
treefcf6d1b50a045e9b95d92351b5cecb8085309a29
parent2447bb085a42abc9858ce6aad1ce15dd9fbf46db (diff)
downloadopenvswitch-df514c62b6685bda925afab6b5857b2067517354.tar.gz
documentation: man vswitchd.conf.db(5) updated flow-restore-wait
Commit 7ed73428a changed the behavior of flow-restore-wait to also prevent the switch from connecting to controllers in the controller table, but failed to update the man page documentation generated by vswitchd/vswitch.xml to reflect this. This commit adds that documentation. Signed-off-by: Zak Whittington <zwhitt.vmware@gmail.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
-rw-r--r--vswitchd/vswitch.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 6d1fc1c1c..efa1ef85e 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -122,6 +122,16 @@
start receiving packets from the datapath and re-setup the flows.
</p>
<p>
+ Additionally, <code>ovs-vswitchd</code> is prevented from connecting
+ to controllers when this value is set to <code>true</code>. This
+ prevents controllers from making changes to the flow table in the
+ middle of flow restoration, which could result in undesirable
+ intermediate states. Once this value has been set to
+ <code>false</code> and the desired flow state has been
+ restored, <code>ovs-vswitchd</code> will be able to reconnect to
+ controllers and process any new flow table modifications.
+ </p>
+ <p>
Thus, with this option, the procedure for a hot-upgrade of
<code>ovs-vswitchd</code> becomes roughly the following:
</p>