From patchwork Fri Nov 2 22:25:29 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Zak Whittington
X-Patchwork-Id: 992569
Return-Path:
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
spf=pass (mailfrom) smtp.mailfrom=openvswitch.org
(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;
envelope-from=ovs-dev-bounces@openvswitch.org;
receiver=)
Authentication-Results: ozlabs.org;
dmarc=fail (p=none dis=none) header.from=gmail.com
Authentication-Results: ozlabs.org;
dkim=fail reason="signature verification failed" (2048-bit key;
unprotected) header.d=gmail.com header.i=@gmail.com
header.b="tCz/MduC"; dkim-atps=neutral
Received: from mail.linuxfoundation.org (mail.linuxfoundation.org
[140.211.169.12])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
bits)) (No client certificate requested)
by ozlabs.org (Postfix) with ESMTPS id 42mxVJ6DHyzB4Zs
for ;
Sat, 3 Nov 2018 09:25:43 +1100 (AEDT)
Received: from mail.linux-foundation.org (localhost [127.0.0.1])
by mail.linuxfoundation.org (Postfix) with ESMTP id B60D1DB1;
Fri, 2 Nov 2018 22:25:39 +0000 (UTC)
X-Original-To: dev@openvswitch.org
Delivered-To: ovs-dev@mail.linuxfoundation.org
Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org
[172.17.192.35])
by mail.linuxfoundation.org (Postfix) with ESMTPS id BD908D1D
for ; Fri, 2 Nov 2018 22:25:37 +0000 (UTC)
X-Greylist: whitelisted by SQLgrey-1.7.6
Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com
[209.85.215.193])
by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6D74A87
for ; Fri, 2 Nov 2018 22:25:37 +0000 (UTC)
Received: by mail-pg1-f193.google.com with SMTP id z17-v6so1563433pgv.3
for ; Fri, 02 Nov 2018 15:25:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:subject:date:message-id;
bh=+oYcffue8pgIY9OlcXHbWz/5zFcQih8nF+3HM2IT3TA=;
b=tCz/MduCW2m5H4o9gbKk1SdeZ0p75IjTAtuijTxvRyjDO49knKudVRK+ndtv2ADow6
UK4M5McVqyxxEr8SYNOaz/tJ78BNCK2Lql2T8vWZT1Hi0Nd2H+IvMRx46UeRxdfejgqb
1P6xzqotnmwFitmkR7rRUINzjwy4M5AudKpUaILrImp+G7vshao6j4rYvfRGQe4vW7HH
1bCZwOdDbba8ljUJeztyPDdNoQNqhC274t+mPQePc8ZSmw5JUXM6bBHuEJKq2v1+Xmx5
EYOHxSMAuYpeJY/biOypVJ44MHq+1drk1iBJcOdFGbe0PsFT2DQPf1s3QGbvj8nYj84U
pJvg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id;
bh=+oYcffue8pgIY9OlcXHbWz/5zFcQih8nF+3HM2IT3TA=;
b=VCXQL9Nc8qQ4L7JwNO1xI/UVujAN/d8+cGI4nY0DHSFZZhWzeDhMmVcI8D1oRoSGsa
SAo4yt+iOLPsz+v+1+NRbrsTEcB0qv/7J3sTKhEy6PLXdV8JTbiI0urgydZJlNQa0LgV
CigXCj7TDrxVdj7CFDFvcHTLBCzkXVKQkbOkZqml1BieWh0O6zHntFEaEBSsmChWs/Yh
O7uBTc5nVtKOQMWqx5DgJjUq9FhstiRkbQRIUELuOnN0MbzDzzo6WfB8X3s8lAJg2Pae
1sNcqpbffijZBTYODUKVw5pzTwrY8Yo1p3c7u72/ecrOw+qQfrg0z6aPquo2MTDlGpAY
lBRQ==
X-Gm-Message-State: AGRZ1gLjxyqMbN7wv72OMfBb11gDITbfFk4PrI6Nag/mOGYAiuxDeFx5
CdOnpI+1F7L96QaN8bMfQW4Q8+he
X-Google-Smtp-Source:
AJdET5e8xZGzdA87r/sFrH1e7cgKcUwRnvyGRKW6Oqp4XpmdVWJ2rBbWB1XSG0kvGJUoR9SVh9c0bA==
X-Received: by 2002:a63:b16:: with SMTP id 22mr12365002pgl.306.1541197536828;
Fri, 02 Nov 2018 15:25:36 -0700 (PDT)
Received: from ubuntu.vmware.com ([208.91.2.1])
by smtp.googlemail.com with ESMTPSA id
i21-v6sm41254178pgj.55.2018.11.02.15.25.36 for
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Fri, 02 Nov 2018 15:25:36 -0700 (PDT)
From: Zak Whittington
To: dev@openvswitch.org
Date: Fri, 2 Nov 2018 15:25:29 -0700
Message-Id: <1541197529-22000-1-git-send-email-zwhitt.vmware@gmail.com>
X-Mailer: git-send-email 2.7.4
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM,
RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
smtp1.linux-foundation.org
Subject: [ovs-dev] [PATCH] documentation: man vswitchd.conf.db(5) updated
flow-restore-wait
X-BeenThere: ovs-dev@openvswitch.org
X-Mailman-Version: 2.1.12
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
MIME-Version: 1.0
Sender: ovs-dev-bounces@openvswitch.org
Errors-To: ovs-dev-bounces@openvswitch.org
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
---
vswitchd/vswitch.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 6d1fc1c..efa1ef8 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -122,6 +122,16 @@
start receiving packets from the datapath and re-setup the flows.
+ Additionally, ovs-vswitchd
is prevented from connecting
+ to controllers when this value is set to true
. 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
+ false
and the desired flow state has been
+ restored, ovs-vswitchd
will be able to reconnect to
+ controllers and process any new flow table modifications.
+
+
Thus, with this option, the procedure for a hot-upgrade of
ovs-vswitchd
becomes roughly the following: