From patchwork Tue May 7 20:15:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1932637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AO+mC75W; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4VYqKZ4v7Xz1xnT for ; Wed, 8 May 2024 06:16:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B496640851; Tue, 7 May 2024 20:16:00 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id VWp95X5EcJnp; Tue, 7 May 2024 20:15:58 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B304C40820 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AO+mC75W Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id B304C40820; Tue, 7 May 2024 20:15:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 844B2C0077; Tue, 7 May 2024 20:15:58 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1A2E4C0037 for ; Tue, 7 May 2024 20:15:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 092F560B8E for ; Tue, 7 May 2024 20:15:58 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id UQMwtCUNK4At for ; Tue, 7 May 2024 20:15:57 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=mmichels@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org C26B160B15 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C26B160B15 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AO+mC75W Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id C26B160B15 for ; Tue, 7 May 2024 20:15:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715112955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+K/ykmwa0/ZbShPcGL8vK9m/8CxlsqUGdLTMFV9xAMs=; b=AO+mC75W0lNJhWqHFAgNyrKi3awF5DXz689c6broRwNaCOqs1f5xSsv/zGoc7YEGgnsKbJ iCoQnyjk4R7pdVuPlImDtAAMPqiDxPQEW6twQhK0VDXj6Al8Nf17Q2OY7X5pGKngmPDeRY Z/YdDtq43KqZ6ycxCjQKHJzHE79rh8c= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-yQ1sybdcOKOwb8KQxycZDg-1; Tue, 07 May 2024 16:15:54 -0400 X-MC-Unique: yQ1sybdcOKOwb8KQxycZDg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8E3F1C004E8 for ; Tue, 7 May 2024 20:15:53 +0000 (UTC) Received: from localhost.redhat.com (ovpn-0-20.rdu2.redhat.com [10.22.0.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CE673C25 for ; Tue, 7 May 2024 20:15:53 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Tue, 7 May 2024 16:15:42 -0400 Message-ID: <20240507201551.1455437-3-mmichels@redhat.com> In-Reply-To: <20240507201551.1455437-1-mmichels@redhat.com> References: <20240507201551.1455437-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 2/4] Inclusive language substitutions: "master". 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" This commit replaces the word "master" with alternative words. Places where "master" is not replaced: * References to third-party URLs, option names, and code repositories. * The "integration" documentation is unchanged. It references pacemaker options which use the word "master". The text also refers to both "masters" and "slaves". In this case, changing the text could cause confusion if pacemaker uses "master" and "slave" in its user-facing options/documentation. Signed-off-by: Mark Michelson --- Documentation/topics/high-availability.rst | 2 +- controller/ha-chassis.c | 2 +- ovn-architecture.7.xml | 2 +- ovn-nb.xml | 10 +++++----- ovn-sb.xml | 8 ++++---- tests/ovn-performance.at | 4 ++-- tests/ovn.at | 14 +++++++------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Documentation/topics/high-availability.rst b/Documentation/topics/high-availability.rst index c3c962c1d..e85a1cd04 100644 --- a/Documentation/topics/high-availability.rst +++ b/Documentation/topics/high-availability.rst @@ -296,7 +296,7 @@ all traffic. We should note that this method works well under the assumption that there are no inter-gateway connectivity failures, in such case this method would fail -to elect a single master. The simplest example is two gateways which stop seeing +to elect a single leader. The simplest example is two gateways which stop seeing each other but can still reach the hypervisors. Protocols like VRRP or CARP have the same issue. A mitigation for this type of failure mode could be achieved by having all network elements (hypervisors and gateways) periodically diff --git a/controller/ha-chassis.c b/controller/ha-chassis.c index d6ec7b658..945c306b6 100644 --- a/controller/ha-chassis.c +++ b/controller/ha-chassis.c @@ -164,7 +164,7 @@ is_local_chassis_only_candidate(const struct sbrec_ha_chassis_group *ha_ch_grp, return (local_chassis_present && n_active_ha_chassis == 1); } -/* Returns true if the local_chassis is the master of +/* Returns true if the local_chassis is the active chassis of * the HA chassis group, false otherwise. */ bool ha_chassis_group_is_active( diff --git a/ovn-architecture.7.xml b/ovn-architecture.7.xml index bfd8680ce..86874f106 100644 --- a/ovn-architecture.7.xml +++ b/ovn-architecture.7.xml @@ -1813,7 +1813,7 @@

When multiple chassis have been specified for a gateway, all chassis that may send packets to that gateway will enable BFD on tunnels to all - configured gateway chassis. The current master chassis for the gateway + configured gateway chassis. The current active chassis for the gateway is the highest priority gateway chassis that is currently viewed as active based on BFD status.

diff --git a/ovn-nb.xml b/ovn-nb.xml index 5cb6ba640..3382d4db6 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -943,7 +943,7 @@ send any traffic to this port. OVN can support native services like DHCPv4/DHCPv6/DNS for this port. If is defined, - ovn-controller running in the master chassis of + ovn-controller running in the active chassis of the HA chassis group will bind this port to provide these native services. It is expected that this port belong to a bridged logical switch (with a localnet port). @@ -4794,10 +4794,10 @@ or Table representing a group of chassis which can provide high availability services. Each chassis in the group is represented by the table . The HA chassis with highest priority will - be the master of this group. If the master chassis failover is detected, - the HA chassis with the next higher priority takes over the + be the active chassis of this group. If the active chassis failover is + detected, the HA chassis with the next higher priority takes over the responsibility of providing the HA. If a distributed gateway router port - references a row in this table, then the master HA chassis in this group + references a row in this table, then the active HA chassis in this group provides the gateway functionality.

@@ -4830,7 +4830,7 @@ or

Priority of the chassis. Chassis with highest priority will be - the master. + the active chassis.

diff --git a/ovn-sb.xml b/ovn-sb.xml index 507a0b571..73a1be5ed 100644 --- a/ovn-sb.xml +++ b/ovn-sb.xml @@ -4682,7 +4682,7 @@ tcp.flags = RST;

Priority of the HA chassis. Chassis with highest priority will be - the master in the HA chassis group. + the active chassis in the HA chassis group.

@@ -4698,13 +4698,13 @@ tcp.flags = RST; Table representing a group of chassis which can provide High availability services. Each chassis in the group is represented by the table . The HA chassis with highest priority will - be the master of this group. If the master chassis failover is detected, - the HA chassis with the next higher priority takes over the + be the active chassis of this group. If the active chassis failover is + detected, the HA chassis with the next higher priority takes over the responsibility of providing the HA. If column of the table references this table, then this HA chassis group provides the gateway functionality and - redirects the gateway traffic to the master of this group. + redirects the gateway traffic to the active chassis of this group.

Name of the . Name should be unique. diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at index 9de0a4e77..dbad83bbb 100644 --- a/tests/ovn-performance.at +++ b/tests/ovn-performance.at @@ -518,8 +518,8 @@ OVN_CONTROLLER_EXPECT_HIT( [ovn-nbctl --wait=hv lrp-set-gateway-chassis lr1-public hv5 10 && ovn-nbctl --wait=hv sync] ) -# Make hv4 master. There is remote possibility that full recompute -# triggers for hv1-hv5 after hv4 becomes master because of updates to the +# Make hv4 active. There is remote possibility that full recompute +# triggers for hv1-hv5 after hv4 becomes active because of updates to the # ovn-hv$i-0 interfaces. Most of the time there will be no recompute. ovn-nbctl --wait=hv lrp-set-gateway-chassis lr1-public hv4 40 hv4_ch=$(ovn-sbctl --bare --columns _uuid list chassis hv4) diff --git a/tests/ovn.at b/tests/ovn.at index 9c173f6cf..58f1f6cd9 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -12798,7 +12798,7 @@ AT_CHECK([uniq packets], [0], [expout]) $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv4/br-ex_n2-tx.pcap > empty AT_CHECK([cat empty], [0], []) -AS_BOX([Make hv4 master]) +AS_BOX([Make hv4 active]) as hv1 reset_pcap_file hv1-vif1 hv1/vif1 as hv4 reset_pcap_file br-ex_n2 hv4/br-ex_n2 ovn-nbctl --wait=sb ha-chassis-group-add-chassis hagrp1 hv4 40 @@ -14213,7 +14213,7 @@ AT_CLEANUP ]) OVN_FOR_EACH_NORTHD([ -AT_SETUP([ensure one gw controller restart in HA doesn't bounce the master]) +AT_SETUP([ensure one gw controller restart in HA doesn't bounce the active chassis]) ovn_start net_add n1 @@ -20274,7 +20274,7 @@ ovn-nbctl ha-chassis-group-add-chassis hagrp1 hv3 10 ovn_wait_for_bfd_up hv1 hv2 hv3 -# hv1 should be master and claim ls1-lp_ext1 +# hv1 should be active and claim ls1-lp_ext1 wait_row_count Port_Binding 1 logical_port=ls1-lp_ext1 chassis=$hv1_uuid wait_for_ports_up ls1-lp_ext1 @@ -20342,10 +20342,10 @@ rm -f ext1_v6.expected rm -f ext1_v6.packets as hv1 reset_pcap_file hv1-ext1 hv1/ext1 -# Now increase the priority of hv3 so it becomes master. +# Now increase the priority of hv3 so it becomes active. ovn-nbctl ha-chassis-group-add-chassis hagrp1 hv3 50 -# hv3 should be master and claim ls1-lp_ext1 +# hv3 should be active and claim ls1-lp_ext1 wait_row_count Port_Binding 1 logical_port=ls1-lp_ext1 chassis=$hv3_uuid wait_for_ports_up ls1-lp_ext1 @@ -20420,7 +20420,7 @@ as hv3 port=${sandbox}_br-phys as main ovs-vsctl del-port n1 $port -# hv1 should be master and claim ls1-lp_ext1 +# hv1 should be active and claim ls1-lp_ext1 wait_row_count Port_Binding 1 logical_port=ls1-lp_ext1 chassis=$hv1_uuid wait_for_ports_up ls1-lp_ext1 @@ -20434,7 +20434,7 @@ grep -c "actions=drop"], [0], [1 as hv1 ovn-appctl -t ovn-controller exit as hv3 ovn-appctl -t ovn-controller exit -# hv2 should be master and claim ls1-lp_ext1 +# hv2 should be active and claim ls1-lp_ext1 wait_row_count Port_Binding 1 logical_port=ls1-lp_ext1 chassis=$hv2_uuid wait_for_ports_up ls1-lp_ext1