From patchwork Fri Feb 2 15:38:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1894667 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TRKgm1mfmz1yQ0 for ; Sat, 3 Feb 2024 02:39:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0988683E76; Fri, 2 Feb 2024 15:38:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0988683E76 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fwavH_9vQqSv; Fri, 2 Feb 2024 15:38:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3452E83E4A; Fri, 2 Feb 2024 15:38:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3452E83E4A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 081E4C0072; Fri, 2 Feb 2024 15:38:56 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id A9E5AC0037 for ; Fri, 2 Feb 2024 15:38:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7099D43776 for ; Fri, 2 Feb 2024 15:38:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 7099D43776 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9KV5E1iTh1OZ for ; Fri, 2 Feb 2024 15:38:53 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp2.osuosl.org (Postfix) with ESMTPS id DF8DB40179 for ; Fri, 2 Feb 2024 15:38:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org DF8DB40179 Received: by mail.gandi.net (Postfix) with ESMTPSA id 0F76040002 for ; Fri, 2 Feb 2024 15:38:50 +0000 (UTC) From: Simon Horman Date: Fri, 02 Feb 2024 16:38:49 +0100 MIME-Version: 1.0 Message-Id: <20240202-dei-member-v1-2-ebdff93fc682@ovn.org> References: <20240202-dei-member-v1-0-ebdff93fc682@ovn.org> In-Reply-To: <20240202-dei-member-v1-0-ebdff93fc682@ovn.org> To: ovs-dev@openvswitch.org Cc: X-Mailer: b4 0.12.3 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH RFC 2/2] vswitch.xml: Rename bond_active_member. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Since the patch-set that included [1] there has been a policy of using the term member for bonds, LACP, and bundle contexts. This is consistent with the more recently adopted policy of using the inclusive naming word list v1 [2, 3]. This patch addresses the name of the bond_active_member ovsdb column. This is used internally to allow the active member of a bond across OVS restart. And the effect of this patch is that when restarting OVS, if the instance before restart did not have this patch and the instance after does, or vice-versa, then active bond member selection will not be sticky across that restart. Otherwise, the existing behaviour is maintained. [1] 91fc374a9c5a ("Eliminate use of term "slave" in bond, LACP, and bundle contexts.") [2] df5e5cf4318a ("Documentation: Add section on inclusive language.") [3] https://inclusivenaming.org/word-lists/ [4] 3e5aeeb581fa ("bridge: Keep bond active slave selection across OVS restart") Signed-off-by: Simon Horman --- vswitchd/bridge.c | 6 +++--- vswitchd/vswitch.ovsschema | 6 +++--- vswitchd/vswitch.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 95a65fcdcd5e..01ec5e183091 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -463,7 +463,7 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_port_col_rstp_status); ovsdb_idl_omit_alert(idl, &ovsrec_port_col_rstp_statistics); ovsdb_idl_omit_alert(idl, &ovsrec_port_col_statistics); - ovsdb_idl_omit_alert(idl, &ovsrec_port_col_bond_active_slave); + ovsdb_idl_omit_alert(idl, &ovsrec_port_col_bond_active_member); ovsdb_idl_omit(idl, &ovsrec_port_col_external_ids); ovsdb_idl_omit_alert(idl, &ovsrec_port_col_trunks); ovsdb_idl_omit_alert(idl, &ovsrec_port_col_vlan_mode); @@ -3003,7 +3003,7 @@ port_refresh_bond_status(struct port *port, bool force_update) ds_init(&mac_s); ds_put_format(&mac_s, ETH_ADDR_FMT, ETH_ADDR_ARGS(mac)); - ovsrec_port_set_bond_active_slave(port->cfg, ds_cstr(&mac_s)); + ovsrec_port_set_bond_active_member(port->cfg, ds_cstr(&mac_s)); ds_destroy(&mac_s); } } @@ -4640,7 +4640,7 @@ port_configure_bond(struct port *port, struct bond_settings *s) netdev_set_miimon_interval(iface->netdev, miimon_interval); } - mac_s = port->cfg->bond_active_slave; + mac_s = port->cfg->bond_active_member; if (!mac_s || !ovs_scan(mac_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(s->active_member_mac))) { /* OVSDB did not store the last active interface */ diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema index e2d5e2e85e60..bfa9f39afb49 100644 --- a/vswitchd/vswitch.ovsschema +++ b/vswitchd/vswitch.ovsschema @@ -1,6 +1,6 @@ {"name": "Open_vSwitch", - "version": "8.5.0", - "cksum": "4040946650 27557", + "version": "9.0.0", + "cksum": "3156488466 27558", "tables": { "Open_vSwitch": { "columns": { @@ -194,7 +194,7 @@ "type": "integer"}, "bond_downdelay": { "type": "integer"}, - "bond_active_slave": { + "bond_active_member": { "type": {"key": {"type": "string"}, "min": 0, "max": 1}}, "bond_fake_iface": { diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 8a1b607d71b9..5bf5a4107b5b 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -2557,7 +2557,7 @@ - + For a bonded port, record the MAC address of the current active member.