From patchwork Tue May 7 20:15:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1932638 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=hDwTpqml; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.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 4VYqKf0T81z1xnT for ; Wed, 8 May 2024 06:16:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7684140873; Tue, 7 May 2024 20:16:03 +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 7DrDwp8OyxOz; Tue, 7 May 2024 20:16:01 +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 091CD40831 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=hDwTpqml Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 091CD40831; Tue, 7 May 2024 20:16:01 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 850AEC0DD5; Tue, 7 May 2024 20:16:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0AFE7C0077 for ; Tue, 7 May 2024 20:15:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C06A740854 for ; Tue, 7 May 2024 20:15:58 +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 nn97DWBWszLg 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 smtp4.osuosl.org C6DEC40864 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C6DEC40864 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id C6DEC40864 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=P1eh90blj8C7tkeTwT9t3IyIPGdRz6NwHxhc6VyzCqM=; b=hDwTpqml5hagCDBGBxLc7imz5TagqGHZief+zLVC1760cmdvOm17RKLJ3OU/Z0ip/oA+Im 09QZHENfUlTOz88RYeZ5YT8aSAINQhGVzzaFvWdWeCC1sgdIBESfYLxaOy7fXZFFsO2HCN 5L8SJnS4cUHHG+oLGJt3hJNdxEznLEA= 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-135-5NUIQCeiOtO1iDq58YPw4w-1; Tue, 07 May 2024 16:15:53 -0400 X-MC-Unique: 5NUIQCeiOtO1iDq58YPw4w-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 5089F1C004E6 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 D1FB53C25 for ; Tue, 7 May 2024 20:15:52 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Tue, 7 May 2024 16:15:41 -0400 Message-ID: <20240507201551.1455437-2-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 1/4] Inclusive language substitutions: "abort". 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 "abort" with alternatives when possible. Places where "abort" is not replaced: * The "abort()" system call, as well as the "ovs_abort()" wrapper. * Any references to SCTP abort. This is the name of the method in SCTP, so referring to it as a different name would be confusing. * Any printed messages about OVSDB transactions being aborted. Like with SCTP, if we use a nonstandard name, it would just be confusing. If the OVSDB state machine eventually updates its state names, then we can also update our printed messages to use the new terminology. Signed-off-by: Mark Michelson --- .ci/dpdk-prepare.sh | 2 +- controller/chassis.c | 2 +- controller/ovn-controller.8.xml | 4 +-- controller/ovn-controller.c | 6 ++-- lib/inc-proc-eng.c | 38 +++++++++++----------- lib/inc-proc-eng.h | 10 +++--- northd/inc-proc-northd.c | 4 +-- tests/ovn-northd.at | 56 ++++++++++++++++----------------- tests/ovs-macros.at | 4 +-- utilities/ovn-appctl.8.xml | 4 +-- 10 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.ci/dpdk-prepare.sh b/.ci/dpdk-prepare.sh index f7e6215dd..5543da90a 100755 --- a/.ci/dpdk-prepare.sh +++ b/.ci/dpdk-prepare.sh @@ -4,7 +4,7 @@ set -ev # Installing wheel separately because it may be needed to build some # of the packages during dependency backtracking and pip >= 22.0 will -# abort backtracking on build failures: +# stop backtracking on build failures: # https://github.com/pypa/pip/issues/10655 pip3 install --disable-pip-version-check --user wheel pip3 install --disable-pip-version-check --user pyelftools diff --git a/controller/chassis.c b/controller/chassis.c index 9bb2eba95..4942ba281 100644 --- a/controller/chassis.c +++ b/controller/chassis.c @@ -1003,7 +1003,7 @@ store_chassis_index_if_needed( goto out; } } - /* All indices consumed: it's safer to just abort. */ + /* All indices consumed: it's safer to just exit. */ VLOG_ERR("All unique controller indices consumed. Exiting."); exit(EXIT_FAILURE); } diff --git a/controller/ovn-controller.8.xml b/controller/ovn-controller.8.xml index 85e7966d7..4953ec93e 100644 --- a/controller/ovn-controller.8.xml +++ b/controller/ovn-controller.8.xml @@ -762,7 +762,7 @@ compute
  • - abort + cancel
    • @@ -773,7 +773,7 @@ Display the ovn-controller engine counter(s) for the specified engine_node_name. counter_name is optional and can be one of recompute, - compute or abort. + compute or cancel.

    diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 453dc62fd..89aa75bc9 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -5856,7 +5856,7 @@ main(int argc, char *argv[]) /* Even if there's no SB DB transaction available, * try to run the engine so that we can handle any * incremental changes that don't require a recompute. - * If a recompute is required, the engine will abort, + * If a recompute is required, the engine will cancel, * triggerring a full run in the next iteration. */ engine_run(false); @@ -6053,8 +6053,8 @@ main(int argc, char *argv[]) " either: br_int %p, chassis %p", br_int, chassis); } - } else if (engine_aborted()) { - VLOG_DBG("engine was aborted, force recompute next time: " + } else if (engine_canceled()) { + VLOG_DBG("engine was canceled, force recompute next time: " "br_int %p, chassis %p", br_int, chassis); engine_set_force_recompute(true); poll_immediate_wake(); diff --git a/lib/inc-proc-eng.c b/lib/inc-proc-eng.c index 21afcf92b..4b379229e 100644 --- a/lib/inc-proc-eng.c +++ b/lib/inc-proc-eng.c @@ -34,7 +34,7 @@ VLOG_DEFINE_THIS_MODULE(inc_proc_eng); static bool engine_force_recompute = false; -static bool engine_run_aborted = false; +static bool engine_run_canceled = false; static const struct engine_context *engine_context; static struct engine_node **engine_nodes; @@ -44,7 +44,7 @@ static const char *engine_node_state_name[EN_STATE_MAX] = { [EN_STALE] = "Stale", [EN_UPDATED] = "Updated", [EN_UNCHANGED] = "Unchanged", - [EN_ABORTED] = "Aborted", + [EN_CANCELED] = "Canceled", }; static long long engine_compute_log_timeout_msec = 500; @@ -144,16 +144,16 @@ engine_dump_stats(struct unixctl_conn *conn, int argc, "Node: %s\n" "- recompute: %12"PRIu64"\n" "- compute: %12"PRIu64"\n" - "- abort: %12"PRIu64"\n", + "- cancel: %12"PRIu64"\n", node->name, node->stats.recompute, - node->stats.compute, node->stats.abort); + node->stats.compute, node->stats.cancel); } else { if (!strcmp(dump_stat_type, "recompute")) { ds_put_format(&dump, "%"PRIu64, node->stats.recompute); } else if (!strcmp(dump_stat_type, "compute")) { ds_put_format(&dump, "%"PRIu64, node->stats.compute); - } else if (!strcmp(dump_stat_type, "abort")) { - ds_put_format(&dump, "%"PRIu64, node->stats.abort); + } else if (!strcmp(dump_stat_type, "cancel")) { + ds_put_format(&dump, "%"PRIu64, node->stats.cancel); } else { ds_put_format(&dump, "Invalid stat type : %s", dump_stat_type); } @@ -351,9 +351,9 @@ engine_has_updated(void) } bool -engine_aborted(void) +engine_canceled(void) { - return engine_run_aborted; + return engine_run_canceled; } void * @@ -385,7 +385,7 @@ engine_init_run(void) } /* Do a full recompute (or at least try). If we're not allowed then - * mark the node as "aborted". + * mark the node as "canceled". */ static void engine_recompute(struct engine_node *node, bool allowed, @@ -399,8 +399,8 @@ engine_recompute(struct engine_node *node, bool allowed, va_end(reason_args); if (!allowed) { - VLOG_DBG("node: %s, recompute (%s) aborted", node->name, reason); - engine_set_node_state(node, EN_ABORTED); + VLOG_DBG("node: %s, recompute (%s) canceled", node->name, reason); + engine_set_node_state(node, EN_CANCELED); goto done; } @@ -454,7 +454,7 @@ engine_compute(struct engine_node *node, bool recompute_allowed) engine_recompute(node, recompute_allowed, "failed handler for input %s", node->inputs[i].node->name); - return (node->state != EN_ABORTED); + return (node->state != EN_CANCELED); } } } @@ -497,7 +497,7 @@ engine_run_node(struct engine_node *node, bool recompute_allowed) } if (need_compute) { - /* If we couldn't compute the node we either aborted or triggered + /* If we couldn't compute the node we either canceled or triggered * a full recompute. In any case, stop processing. */ if (!engine_compute(node, recompute_allowed)) { @@ -516,20 +516,20 @@ engine_run_node(struct engine_node *node, bool recompute_allowed) void engine_run(bool recompute_allowed) { - /* If the last run was aborted skip the incremental run because a + /* If the last run was canceled skip the incremental run because a * recompute is needed first. */ - if (!recompute_allowed && engine_run_aborted) { + if (!recompute_allowed && engine_run_canceled) { return; } - engine_run_aborted = false; + engine_run_canceled = false; for (size_t i = 0; i < engine_n_nodes; i++) { engine_run_node(engine_nodes[i], recompute_allowed); - if (engine_nodes[i]->state == EN_ABORTED) { - engine_nodes[i]->stats.abort++; - engine_run_aborted = true; + if (engine_nodes[i]->state == EN_CANCELED) { + engine_nodes[i]->stats.cancel++; + engine_run_canceled = true; return; } } diff --git a/lib/inc-proc-eng.h b/lib/inc-proc-eng.h index c7e45e739..68bbd8266 100644 --- a/lib/inc-proc-eng.h +++ b/lib/inc-proc-eng.h @@ -194,7 +194,7 @@ enum engine_node_state { EN_UNCHANGED, /* Data in the node is valid and didn't change during the * last run. */ - EN_ABORTED, /* During the last run, processing was aborted for + EN_CANCELED, /* During the last run, processing was canceled for * this node. */ EN_STATE_MAX, @@ -203,7 +203,7 @@ enum engine_node_state { struct engine_stats { uint64_t recompute; uint64_t compute; - uint64_t abort; + uint64_t cancel; }; struct engine_node { @@ -271,7 +271,7 @@ void engine_init_run(void); /* Execute the processing, which should be called in the main loop. * Updates the engine node's states accordingly. If 'recompute_allowed' is * false and a recompute is required by the current engine run then the engine - * aborts. + * cancels its processing. */ void engine_run(bool recompute_allowed); @@ -327,8 +327,8 @@ bool engine_has_run(void); * has changed; false if nothing has changed. */ bool engine_has_updated(void); -/* Returns true if during the last engine run we had to abort processing. */ -bool engine_aborted(void); +/* Returns true if during the last engine run we had to cancel processing. */ +bool engine_canceled(void); /* Return a pointer to node data accessible for users outside the processing * engine. If the node data is not valid (e.g., last engine_run() failed or diff --git a/northd/inc-proc-northd.c b/northd/inc-proc-northd.c index e1073812c..d56e9783a 100644 --- a/northd/inc-proc-northd.c +++ b/northd/inc-proc-northd.c @@ -421,8 +421,8 @@ bool inc_proc_northd_run(struct ovsdb_idl_txn *ovnnb_txn, } else { VLOG_DBG("engine did not run, and it was not needed"); } - } else if (engine_aborted()) { - VLOG_DBG("engine was aborted, force recompute next time."); + } else if (engine_canceled()) { + VLOG_DBG("engine was canceled, force recompute next time."); engine_set_force_recompute(true); poll_immediate_wake(); } else { diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 680d96675..ec18d2dd4 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -59,7 +59,7 @@ $recompute : compute - $compute" node_stat=$(as northd ovn-appctl -t ovn-northd inc-engine/show-stats $node) # node_stat will be of this format : - # - Node: lflow - recompute: 3 - compute: 0 - abort: 0 + # - Node: lflow - recompute: 3 - compute: 0 - cancel: 0 node_recompute_ct=$(echo $node_stat | cut -d '-' -f2 | cut -d ':' -f2) node_compute_ct=$(echo $node_stat | cut -d '-' -f3 | cut -d ':' -f2) @@ -9550,14 +9550,14 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl The port_group node recomputes every time a NB port group is added/deleted. AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], [0], [dnl Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl The port_group node is an input for the lflow node. Port_group dnl recompute/compute triggers lflow recompute. @@ -9565,7 +9565,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) CHECK_NO_CHANGE_AFTER_RECOMPUTE @@ -9587,7 +9587,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl The port_group node recomputes also every time a port from a new switch dnl is added to the group. @@ -9595,7 +9595,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl The port_group node is an input for the lflow node. Port_group dnl recompute/compute triggers lflow recompute. @@ -9603,7 +9603,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl Expect ACL1 on sw1 and sw2 check_acl_lflows 1 0 1 0 @@ -9623,7 +9623,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl The port_group node recomputes also every time a port from a new switch dnl is added to the group. @@ -9631,7 +9631,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl The port_group node is an input for the lflow node. Port_group dnl recompute/compute triggers lflow recompute (for ACLs). @@ -9639,7 +9639,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and sw2 check_acl_lflows 1 1 1 1 @@ -9660,7 +9660,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We did not change the set of switches a pg is applied to, there should be dnl no recompute. @@ -9668,7 +9668,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 0 - compute: 1 -- abort: 0 +- cancel: 0 ]) dnl We did not change the set of switches a pg is applied to, there should be dnl no recompute. @@ -9676,7 +9676,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 0 - compute: 1 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and sw2 check_acl_lflows 1 1 1 1 @@ -9698,7 +9698,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We did not change the set of switches a pg is applied to, there should be dnl no recompute. @@ -9706,7 +9706,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 0 - compute: 1 -- abort: 0 +- cancel: 0 ]) dnl We did not change the set of switches a pg is applied to, there should be dnl no recompute. @@ -9714,7 +9714,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 0 - compute: 1 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and sw2 check_acl_lflows 1 1 1 1 @@ -9734,7 +9734,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be dnl a recompute. @@ -9742,7 +9742,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be dnl a recompute (for ACLs). @@ -9750,7 +9750,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and only the first one on sw2. check_acl_lflows 1 1 1 0 @@ -9771,7 +9771,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be dnl a recompute. @@ -9779,7 +9779,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be dnl a recompute (for ACLs). @@ -9787,7 +9787,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and not on sw2. check_acl_lflows 1 1 0 0 @@ -9808,7 +9808,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be a dnl recompute. @@ -9816,7 +9816,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be a dnl recompute. @@ -9824,7 +9824,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and sw2 check_acl_lflows 1 1 1 1 @@ -9847,7 +9847,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats northd], [0], Node: northd - recompute: 0 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be a dnl recompute. @@ -9855,7 +9855,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats port_group], Node: port_group - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl We changed the set of switches a pg is applied to, there should be a dnl recompute. @@ -9863,7 +9863,7 @@ AT_CHECK([as northd ovn-appctl -t ovn-northd inc-engine/show-stats lflow], [0], Node: lflow - recompute: 1 - compute: 0 -- abort: 0 +- cancel: 0 ]) dnl Expect both ACLs on sw1 and no ACLs on sw2 check_acl_lflows 1 1 0 0 diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at index 35760cf06..0e3b1bcd6 100644 --- a/tests/ovs-macros.at +++ b/tests/ovs-macros.at @@ -280,7 +280,7 @@ dnl Executes shell COMMAND in a loop until it returns dnl zero return code. If COMMAND did not return dnl zero code within reasonable time limit, then dnl the test fails. In that case, runs IF-FAILED -dnl before aborting. +dnl before exiting. m4_define([OVS_WAIT_UNTIL], [check_ovs_wait_until_args "$#" "$2" OVS_WAIT([$1], [$2], [AT_LINE], [until $1])]) @@ -334,7 +334,7 @@ dnl Executes shell COMMAND in a loop until it returns dnl non-zero return code. If COMMAND did not return dnl non-zero code within reasonable time limit, then dnl the test fails. In that case, runs IF-FAILED -dnl before aborting. +dnl before exiting. m4_define([OVS_WAIT_WHILE], [OVS_WAIT([if $1; then return 1; else return 0; fi], [$2], [AT_LINE], [while $1])]) diff --git a/utilities/ovn-appctl.8.xml b/utilities/ovn-appctl.8.xml index 32a42a766..a790e52bb 100644 --- a/utilities/ovn-appctl.8.xml +++ b/utilities/ovn-appctl.8.xml @@ -80,7 +80,7 @@
    emer
    - A major failure forced a process to abort. + A major failure forced a process to hard stop.
    err
    @@ -349,4 +349,4 @@ Prints version information to the console.
    - \ No newline at end of file + 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 From patchwork Tue May 7 20:15:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1932640 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=huysfoIZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4VYqKn4zQcz1xnT for ; Wed, 8 May 2024 06:16:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 61ED160BB4; Tue, 7 May 2024 20:16:09 +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 nsSTiekOWDL6; Tue, 7 May 2024 20:16:05 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E597360BC3 Authentication-Results: smtp3.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=huysfoIZ Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id E597360BC3; Tue, 7 May 2024 20:16:03 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7A252C0077; Tue, 7 May 2024 20:16:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 94593C0DD9 for ; Tue, 7 May 2024 20:16:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 60DDC4085A for ; Tue, 7 May 2024 20:16:01 +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 PNrqaWhI8cXB for ; Tue, 7 May 2024 20:15:58 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=mmichels@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 52E6740499 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 52E6740499 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=huysfoIZ Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 52E6740499 for ; Tue, 7 May 2024 20:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715112957; 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=J/YbNH15fZlxFKHlOuHhy7UQ7gTXe1XDTCz9f/yV+qM=; b=huysfoIZ92rRhGIZ/we3tiD845/wpIrIhNcit8nxPjHobUVOYj2Mp6kBZjUqzpJbtE+VVU SUOSSQlPq+d64FcL+JL0vciB2n6P1d687Z7FW3plPkgrx6KFu+MRsbyJVB83tI9ppOJJkp 1kWsgSzkA6Jp3fJ7V300Grd7YsAQsic= 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-230-EReOvRjyO3GS8eNZ1sghTQ-1; Tue, 07 May 2024 16:15:54 -0400 X-MC-Unique: EReOvRjyO3GS8eNZ1sghTQ-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 6D96D3802126 for ; Tue, 7 May 2024 20:15:54 +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 1E2FF3C25 for ; Tue, 7 May 2024 20:15:53 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Tue, 7 May 2024 16:15:43 -0400 Message-ID: <20240507201551.1455437-4-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 3/4] Inclusive language substitutions: "blacklist/whitelist". 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 changes the word "blacklist" to "denylist" throughout the code. It also changes the word "whitelist" to "allowlist" throughout the code. The option "ic-route-blacklist" in the northbound global options has been renamed to "ic-route-denylist", but the old option name is still accepted in order to maintain backwards compatibility. The old option name is no longer documented, however. Signed-off-by: Mark Michelson --- NEWS | 4 ++++ ic/ovn-ic.c | 23 +++++++++++++---------- ovn-nb.xml | 2 +- tests/ofproto-macros.at | 4 ++-- tests/ovn-controller-vtep.at | 2 +- tests/ovn-ic.at | 32 ++++++++++++++++---------------- tests/system-kmod-macros.at | 4 ++-- tests/system-userspace-macros.at | 4 ++-- 8 files changed, 41 insertions(+), 34 deletions(-) diff --git a/NEWS b/NEWS index 3b5e93dc9..b2df43b3a 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ Post v24.03.0 external-ids, the option is no longer needed as it became effectively "true" for all scenarios. - Added DHCPv4 relay support. + - The "options:ic-route-blacklist" option in the Northbound NB_Global table + has been renamed to "options:ic-route-denylist" in order to comply with + inclusive language guidelines. The previous name is still recognized to + aid with backwards compatibility. OVN v24.03.0 - 01 Mar 2024 -------------------------- diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c index e947323bf..3fd74ecba 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -1029,24 +1029,27 @@ prefix_is_link_local(struct in6_addr *prefix, unsigned int plen) } static bool -prefix_is_black_listed(const struct smap *nb_options, - struct in6_addr *prefix, - unsigned int plen) +prefix_is_deny_listed(const struct smap *nb_options, + struct in6_addr *prefix, + unsigned int plen) { - const char *blacklist = smap_get(nb_options, "ic-route-blacklist"); - if (!blacklist || !blacklist[0]) { - return false; + const char *denylist = smap_get(nb_options, "ic-route-denylist"); + if (!denylist || !denylist[0]) { + denylist = smap_get(nb_options, "ic-route-blacklist"); + if (!denylist || !denylist[0]) { + return false; + } } struct in6_addr bl_prefix; unsigned int bl_plen; char *cur, *next, *start; - next = start = xstrdup(blacklist); + next = start = xstrdup(denylist); bool matched = false; while ((cur = strsep(&next, ",")) && *cur) { if (!ip46_parse_cidr(cur, &bl_prefix, &bl_plen)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); VLOG_WARN_RL(&rl, "Bad format in nb_global options:" - "ic-route-blacklist: %s. CIDR expected.", cur); + "ic-route-denylist: %s. CIDR expected.", cur); continue; } @@ -1109,7 +1112,7 @@ route_need_advertise(const char *policy, return false; } - if (prefix_is_black_listed(nb_options, prefix, plen)) { + if (prefix_is_deny_listed(nb_options, prefix, plen)) { return false; } return true; @@ -1281,7 +1284,7 @@ route_need_learn(const struct nbrec_logical_router *lr, return false; } - if (prefix_is_black_listed(nb_options, prefix, plen)) { + if (prefix_is_deny_listed(nb_options, prefix, plen)) { return false; } diff --git a/ovn-nb.xml b/ovn-nb.xml index 3382d4db6..15976b95a 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -442,7 +442,7 @@ ic-route-learn is true. - + A string value contains a list of CIDRs delimited by ",". A route will not be advertised or learned if the route's prefix belongs to any of the CIDRs listed. diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 31a067c1e..ab73e50d9 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -354,11 +354,11 @@ add_pmd_of_ports () { m4_divert_pop([PREPARE_TESTS]) -# OVS_VSWITCHD_STOP([WHITELIST]) +# OVS_VSWITCHD_STOP([ALLOWLIST]) # # Gracefully stops ovs-vswitchd and ovsdb-server, checking their log files # for messages with severity WARN or higher and signaling an error if any -# is present. The optional WHITELIST may contain shell-quoted "sed" +# is present. The optional ALLOWLIST may contain shell-quoted "sed" # commands to delete any warnings that are actually expected, e.g.: # # OVS_VSWITCHD_STOP(["/expected error/d"]) diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index d35dbbd05..ea67c2a5c 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -57,7 +57,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], [ --ovnsb-db=unix:$ovs_base/ovn-sb/ovn-sb.sock ]) -# OVN_CONTROLLER_VTEP_STOP(WHITELIST, SIM_NAME) +# OVN_CONTROLLER_VTEP_STOP(ALLOWLIST, SIM_NAME) # # $1 - (optional) passed to check_logs() # $2 - (optional) simulator name diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index ad24011f2..8e50720b1 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -524,14 +524,14 @@ OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192 ovn_as az1 ovn-nbctl lrp-del lrp-lr1-ls1 OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168]) -# Test blacklist routes +# Test denylist routes # Add back the directly connected 192.168 route. ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24" OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168]) # Ensure AZ1 learned AZ2's 10.11.2.0 route as well. OVS_WAIT_UNTIL([ovn_as az1 ovn-nbctl lr-route-list lr1 | grep learned | grep 10.11]) # Now black list 10.11.0.0/16 and 192.168.0.0/16 in AZ2. -ovn_as az2 ovn-nbctl set nb_global . options:ic-route-blacklist="10.11.0.0/16,192.168.0.0/16" +ovn_as az2 ovn-nbctl set nb_global . options:ic-route-denylist="10.11.0.0/16,192.168.0.0/16" # AZ2 shouldn't learn 192.168 route any more. OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168]) # AZ1 shouldn't learn 10.11 any more. @@ -554,8 +554,8 @@ for i in 1 2; do ovn-nbctl set nb_global . options:ic-route-learn=true # Ensure route advertising at AZ level ovn-nbctl set nb_global . options:ic-route-adv=true - # Drop blacklist - ovn-nbctl remove nb_global . options ic-route-blacklist + # Drop denylist + ovn-nbctl remove nb_global . options ic-route-denylist for j in 1 2; do ts=ts$j$j @@ -860,12 +860,12 @@ Route Table rtb1: ovn_as az1 ovn-nbctl lrp-del lrp-lr1-ls1 OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168]) -# Test blacklist routes +# Test denylist routes # Add back the directly connected 192.168 route. ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24" OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168]) -# Now add 10.11.0.0/16 and 192.168.0.0/16 to blacklist in AZ2. -check ovn_as az2 ovn-nbctl set nb_global . options:ic-route-blacklist="10.11.0.0/16,192.168.0.0/16" +# Now add 10.11.0.0/16 and 192.168.0.0/16 to denylist in AZ2. +check ovn_as az2 ovn-nbctl set nb_global . options:ic-route-denylist="10.11.0.0/16,192.168.0.0/16" # AZ2 shouldn't learn 192.168 route any more. OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168]) # AZ1 shouldn't learn 10.11 any more. @@ -1324,8 +1324,8 @@ AT_CLEANUP ]) OVN_FOR_EACH_NORTHD([ -AT_SETUP([ovn-ic -- route sync -- IPv6 blacklist filter]) -AT_KEYWORDS([IPv6-route-sync-blacklist]) +AT_SETUP([ovn-ic -- route sync -- IPv6 denylist filter]) +AT_KEYWORDS([IPv6-route-sync-denylist]) ovn_init_ic_db check ovn-ic-nbctl ts-add ts1 @@ -1338,8 +1338,8 @@ for i in 1 2; do check ovn-nbctl set nb_global . options:ic-route-learn=true # Enable route advertising at AZ level check ovn-nbctl set nb_global . options:ic-route-adv=true - # Enable blacklist single filter for IPv6 - check ovn-nbctl set nb_global . options:ic-route-blacklist=" \ + # Enable denylist single filter for IPv6 + check ovn-nbctl set nb_global . options:ic-route-denylist=" \ 2003:db8:1::/64,2004:aaaa::/32,2005:1234::/21" check ovn-ic-nbctl --wait=sb sync @@ -1355,7 +1355,7 @@ for i in 1 2; do check ovn-nbctl lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i \ 2002:db8:1::$i/64 - # Create blacklisted LRPs and connect to TS + # Create denylisted LRPs and connect to TS check ovn-nbctl lrp-add lr$i lrp-lr$i-p-ext$i \ 11:11:11:11:11:1$i 2003:db8:1::$i/64 @@ -1381,8 +1381,8 @@ AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1 | for i in 1 2; do ovn_as az$i - # Drop blacklist - check ovn-nbctl remove nb_global . options ic-route-blacklist + # Drop denylist + check ovn-nbctl remove nb_global . options ic-route-denylist done check ovn-ic-nbctl --wait=sb sync @@ -1399,9 +1399,9 @@ for i in 1 2; do ovn_as az$i check ovn-nbctl set nb_global . \ - options:ic-route-blacklist="2003:db8:1::/64,2004:db8:1::/64" + options:ic-route-denylist="2003:db8:1::/64,2004:db8:1::/64" - # Create an 'extra' blacklisted LRP and connect to TS + # Create an 'extra' denylisted LRP and connect to TS check ovn-nbctl lrp-add lr$i lrp-lr$i-p-ext5$i \ 55:55:55:55:55:5$i 2004:db8:1::$i/64 done diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 6f6670199..1c545d082 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -32,11 +32,11 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], fi ]) -# OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) +# OVS_TRAFFIC_VSWITCHD_STOP([ALLOWLIST], [extra_cmds]) # # Gracefully stops ovs-vswitchd and ovsdb-server, checking their log files # for messages with severity WARN or higher and signaling an error if any -# is present. The optional WHITELIST may contain shell-quoted "sed" +# is present. The optional ALLOWLIST may contain shell-quoted "sed" # commands to delete any warnings that are actually expected, e.g.: # # OVS_TRAFFIC_VSWITCHD_STOP(["/expected error/d"]) diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 73ca2cce3..83361c0ce 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -24,11 +24,11 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], fi ]) -# OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) +# OVS_TRAFFIC_VSWITCHD_STOP([ALLOWLIST], [extra_cmds]) # # Gracefully stops ovs-vswitchd and ovsdb-server, checking their log files # for messages with severity WARN or higher and signaling an error if any -# is present. The optional WHITELIST may contain shell-quoted "sed" +# is present. The optional ALLOWLIST may contain shell-quoted "sed" # commands to delete any warnings that are actually expected, e.g.: # # OVS_TRAFFIC_VSWITCHD_STOP(["/expected error/d"]) From patchwork Tue May 7 20:15:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1932639 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=A8B9Cjkm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4VYqKk4L1Kz1xnT for ; Wed, 8 May 2024 06:16:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 022E860BCB; Tue, 7 May 2024 20:16:04 +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 WMoFR2ScKnHA; Tue, 7 May 2024 20:16:02 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0A93960B78 Authentication-Results: smtp3.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=A8B9Cjkm Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0A93960B78; Tue, 7 May 2024 20:16:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8C5B7C0DD8; Tue, 7 May 2024 20:16:01 +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 2B2F5C0DD5 for ; Tue, 7 May 2024 20:15:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BACF860BA5 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 pbhcopAZFdmC for ; Tue, 7 May 2024 20:15:58 +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 009A260B77 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 009A260B77 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 009A260B77 for ; Tue, 7 May 2024 20:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715112957; 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=lsm4r4EL6Qo7u30NKLSqEFdgNHVHizWneWg8npqTbjs=; b=A8B9CjkmZH2z8/vn9+i0NBF3P+kz5lMroCIyg4xrHFWAnBfBYkpOSagrUIQsaRIRTMpO2i mA11Tf5J/zsNXR1ai+O9UAfZm0T60hXb7TMHq+wkDRi1r9znJQNjZK8vuXR0gYdD3Z1cgw KpB7qkM/fn5iDfRt3EW3PXcZO6Q8+aU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-137-L8MSadXbNtC6OBKMmulz8Q-1; Tue, 07 May 2024 16:15:55 -0400 X-MC-Unique: L8MSadXbNtC6OBKMmulz8Q-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 02A26800053 for ; Tue, 7 May 2024 20:15:55 +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 A415A3C25 for ; Tue, 7 May 2024 20:15:54 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Tue, 7 May 2024 16:15:44 -0400 Message-ID: <20240507201551.1455437-5-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 4/4] Inclusive language substitutions: "sanity-check". 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 change introduces alternatives for "sanity-check" (and its variants) throughout the code. Places where "sanity-check" is not replaced: * Many libtool-related files are auto-generated and contain the phrase. Since these files are auto-generated, I did not update these files. Signed-off-by: Mark Michelson --- lib/inc-proc-eng.h | 2 +- tests/ovn-northd.at | 4 ++-- utilities/ovn-nbctl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/inc-proc-eng.h b/lib/inc-proc-eng.h index 68bbd8266..5bb3b8f3e 100644 --- a/lib/inc-proc-eng.h +++ b/lib/inc-proc-eng.h @@ -342,7 +342,7 @@ bool engine_canceled(void); */ void *engine_get_data(struct engine_node *node); -/* Return a pointer to node data *without* performing any sanity checks on +/* Return a pointer to node data *without* performing any coherance checks on * the state of the node. This may be used only in specific cases when data * is guaranteed to be valid, e.g., immediately after initialization and * before the first engine_run(). diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index ec18d2dd4..6a7eb839a 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -7340,7 +7340,7 @@ AT_CHECK([cat log_flows], [0], [dnl rm log_flows -# And just for sanity's sake, let's remove the allow-related ACL and make sure +# And just to verify, let's remove the allow-related ACL and make sure # all the special log messages are gone. check ovn-nbctl acl-del pg2 check ovn-nbctl --wait=sb sync @@ -7445,7 +7445,7 @@ AT_CHECK([cat log_flows], [0], [dnl rm log_flows -# And just for sanity's sake, let's remove the allow-related ACL and make sure +# And just to verify, let's remove the allow-related ACL and make sure # all the special log messages are gone. check ovn-nbctl acl-del pg2 check ovn-nbctl --wait=sb sync diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c index 618f3a18b..99d2cba8c 100644 --- a/utilities/ovn-nbctl.c +++ b/utilities/ovn-nbctl.c @@ -5992,7 +5992,7 @@ nbctl_lrp_add(struct ctl_context *ctx) return; } - /* Special-case sanity-check of peer ports. */ + /* Special-case coherance-check of peer ports. */ const char *peer = NULL; for (int i = 0; i < n_settings; i++) { if (!strncmp(settings[i], "peer=", 5)) {