From patchwork Sat Mar 18 23:50:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758582 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::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aSapwDsr; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfHnK5TWPz1yWp for ; Sun, 19 Mar 2023 10:50:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E70D641681; Sat, 18 Mar 2023 23:50:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E70D641681 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aSapwDsr X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nDDg6FP-VY_3; Sat, 18 Mar 2023 23:50:42 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0D54C415C9; Sat, 18 Mar 2023 23:50:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0D54C415C9 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id AF80EC008D; Sat, 18 Mar 2023 23:50:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9EED3C0032 for ; Sat, 18 Mar 2023 23:50:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 6D4CD60ADD for ; Sat, 18 Mar 2023 23:50:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6D4CD60ADD Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aSapwDsr X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RcbkzkN8sl1x for ; Sat, 18 Mar 2023 23:50:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5F6C060E19 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5F6C060E19 for ; Sat, 18 Mar 2023 23:50:36 +0000 (UTC) Received: by mail-lf1-x12d.google.com with SMTP id r27so10780151lfe.10 for ; Sat, 18 Mar 2023 16:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679183434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p6XEd9qSaRX0V7QyMGZQ3ciBbKaeQtNGEfog2O1SmWs=; b=aSapwDsrjtYZssHUuBxg5B2/ybQCWCaYRVL1TmjEa62RbfBP9BksR0ixrAKSDkW67Y PdYoeIeK2XPXYXhd5dRMhfXcj0lDURuBBp0UXu6oMcP80MMYktqIVyGYe3GBpQH3fxaa fcxXncEAe7utuE3F6k41k2UjGrJLy8eiAE2vARIT6zd1ynw+LTP4bWA3ZkK+bqqqHHWs GViUNb9/fEz7Ms16Cm5Z/JxRdyWC0wnQfLo5LtOlrnrFV7rQTdcKA/bOak8SilBzrSUX CJHkxtF2nLkKAnxSq77a38qMFwdkQbvwvAm+Y8VwT6roU3SyxpojJjenI9R0OpS3Azuv q25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679183434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p6XEd9qSaRX0V7QyMGZQ3ciBbKaeQtNGEfog2O1SmWs=; b=yVohDtibJLq9HugYWiN2/JmgV/1xCs7zxCfkH25wYFEV53QZF0Lk1uqTo/28SG1Jvu GuQksvZwJ4ov2lZBGNPx04A+M0IYPqLSXa//wejNVfOvOvhL4F+NDU+YXKQhkh3hFCaL /U3rZDLU76bXu3nSkQEvDAhngyOv+lcdjaPLsUHdaAXiRdIlVG0dmhfxeqQ97BrZYJPI LEmkG+Fwx4hyu1b2n/CfdDJ1GrdT6DP+metKd4lCvqsidoteFsOhpBn4oKXuILvz2Ux+ QFjB4G1mDSN4h91acFQHZaDtBT0PtmL4zgkyzC0mU5qMQLLKI6HVP+dqjEpqwjLZhXKD 2b9g== X-Gm-Message-State: AO0yUKWRDwmxB6pmnUHlPxxA0+KkDHjJRk/Df2hSxv5HHpG59dJKPeiF Vsa2v/e1myZ2s2JhVIkj9xOGxk7/g0o= X-Google-Smtp-Source: AK7set9ti2hWQnKLU/sqWqqxR96v37mQgcj57ApVo8ufXsrM5QbmMg0vYQEKbAEK/qoyaLUMCUnzJg== X-Received: by 2002:a05:6512:11c6:b0:4d3:9c2a:e73b with SMTP id h6-20020a05651211c600b004d39c2ae73bmr5211746lfr.30.1679183433897; Sat, 18 Mar 2023 16:50:33 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id v6-20020a2e9f46000000b0029c13f4d519sm162007ljk.119.2023.03.18.16.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 16:50:33 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 02:50:26 +0300 Message-Id: <20230318235031.3793301-2-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 1/6] controller, northd: move inactivity probe configuration to lib/ 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" ovn-northd and ovn-controller had similar code to configure inactivity probe interval. This patch moves common logic to lib/ovn-util module. Signed-off-by: Vladislav Odintsov --- controller/ovn-controller.c | 8 ++------ lib/ovn-util.c | 22 ++++++++++++++++++++++ lib/ovn-util.h | 4 ++++ northd/ovn-northd.c | 30 +++++------------------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 7dcbfd252..2c09551cf 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -104,7 +104,6 @@ static unixctl_cb_func debug_ignore_startup_delay; #define DEFAULT_BRIDGE_NAME "br-int" #define DEFAULT_DATAPATH "system" -#define DEFAULT_PROBE_INTERVAL_MSEC 5000 #define OFCTRL_DEFAULT_PROBE_INTERVAL_SEC 0 #define CONTROLLER_LOOP_STOPWATCH_NAME "flow-generation" @@ -595,13 +594,10 @@ update_sb_db(struct ovsdb_idl *ovs_idl, struct ovsdb_idl *ovnsb_idl, ovsdb_idl_set_remote(ovnsb_idl, remote, true); /* Set probe interval, based on user configuration and the remote. */ - int default_interval = (remote && !stream_or_pstream_needs_probes(remote) - ? 0 : DEFAULT_PROBE_INTERVAL_MSEC); int interval = get_chassis_external_id_value_int( - &cfg->external_ids, chassis_id, - "ovn-remote-probe-interval", default_interval); - ovsdb_idl_set_probe_interval(ovnsb_idl, interval); + &cfg->external_ids, chassis_id, "ovn-remote-probe-interval", -1); + set_idl_probe_interval(ovnsb_idl, remote, interval); bool monitor_all = get_chassis_external_id_value_bool( diff --git a/lib/ovn-util.c b/lib/ovn-util.c index 561e82093..13ae0dcce 100644 --- a/lib/ovn-util.c +++ b/lib/ovn-util.c @@ -27,12 +27,16 @@ #include "ovn-dirs.h" #include "ovn-nb-idl.h" #include "ovn-sb-idl.h" +#include "ovsdb-idl.h" #include "socket-util.h" +#include "stream.h" #include "svec.h" #include "unixctl.h" VLOG_DEFINE_THIS_MODULE(ovn_util); +#define DEFAULT_PROBE_INTERVAL_MSEC 5000 + void ovn_conn_show(struct unixctl_conn *conn, int argc OVS_UNUSED, const char *argv[] OVS_UNUSED, void *idl_) { @@ -43,6 +47,24 @@ void ovn_conn_show(struct unixctl_conn *conn, int argc OVS_UNUSED, ovsdb_idl_is_connected(idl) ? "connected": "not connected"); } +/* Set inactivity probe interval for 'idl' and 'remote' to 'interval'. + * If 'interval' < 0 (no preference from daemon settings), set it to 5000ms; + * if 'remote' needs probing, disable otherwise. + * 'interval' value of 0 disables probing. + */ +void set_idl_probe_interval(struct ovsdb_idl *idl, const char *remote, + int interval) +{ + if (interval < 0) { + interval = (remote && !stream_or_pstream_needs_probes(remote) + ? 0 : DEFAULT_PROBE_INTERVAL_MSEC); + } else if (interval > 0 && interval < 1000) { + interval = 1000; + } + + ovsdb_idl_set_probe_interval(idl, interval); +} + static void add_ipv4_netaddr(struct lport_addresses *laddrs, ovs_be32 addr, unsigned int plen) diff --git a/lib/ovn-util.h b/lib/ovn-util.h index a1a418a24..7cf861dbc 100644 --- a/lib/ovn-util.h +++ b/lib/ovn-util.h @@ -16,6 +16,7 @@ #ifndef OVN_UTIL_H #define OVN_UTIL_H 1 +#include "ovsdb-idl.h" #include "lib/packets.h" #include "include/ovn/version.h" @@ -140,6 +141,9 @@ uint32_t ovn_logical_flow_hash_datapath(const struct uuid *logical_datapath, void ovn_conn_show(struct unixctl_conn *conn, int argc OVS_UNUSED, const char *argv[] OVS_UNUSED, void *idl_); +void set_idl_probe_interval(struct ovsdb_idl *idl, const char *remote, + int interval); + #define OVN_MAX_DP_KEY ((1u << 24) - 1) #define OVN_MAX_DP_GLOBAL_NUM ((1u << 16) - 1) #define OVN_MIN_DP_KEY_LOCAL 1 diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 5f895b053..116b6e801 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -71,11 +71,6 @@ static const char *ssl_private_key_file; static const char *ssl_certificate_file; static const char *ssl_ca_cert_file; -/* Default probe interval for NB and SB DB connections. */ -#define DEFAULT_PROBE_INTERVAL_MSEC 5000 -static int northd_probe_interval_nb = 0; -static int northd_probe_interval_sb = 0; - static const char *rbac_chassis_auth[] = {"name"}; static const char *rbac_chassis_update[] = @@ -684,20 +679,6 @@ update_ssl_config(void) } } -static int -get_probe_interval(const char *db, const struct nbrec_nb_global *nb) -{ - int default_interval = (db && !stream_or_pstream_needs_probes(db) - ? 0 : DEFAULT_PROBE_INTERVAL_MSEC); - int interval = smap_get_int(&nb->options, - "northd_probe_interval", default_interval); - - if (interval > 0 && interval < 1000) { - interval = 1000; - } - return interval; -} - static struct ovsdb_idl_txn * run_idl_loop(struct ovsdb_idl_loop *idl_loop, const char *name) { @@ -1014,14 +995,13 @@ main(int argc, char *argv[]) const struct nbrec_nb_global *nb = nbrec_nb_global_first(ovnnb_idl_loop.idl); /* Update the probe interval. */ + int interval = -1; if (nb) { - northd_probe_interval_nb = get_probe_interval(ovnnb_db, nb); - northd_probe_interval_sb = get_probe_interval(ovnsb_db, nb); + interval = smap_get_int(&nb->options, "northd_probe_interval", + interval); } - ovsdb_idl_set_probe_interval(ovnnb_idl_loop.idl, - northd_probe_interval_nb); - ovsdb_idl_set_probe_interval(ovnsb_idl_loop.idl, - northd_probe_interval_sb); + set_idl_probe_interval(ovnnb_idl_loop.idl, ovnnb_db, interval); + set_idl_probe_interval(ovnsb_idl_loop.idl, ovnsb_db, interval); if (reset_ovnsb_idl_min_index) { VLOG_INFO("Resetting southbound database cluster state"); From patchwork Sat Mar 18 23:50:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758583 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::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ci8JNGhr; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfHnM1cskz1yWp for ; Sun, 19 Mar 2023 10:50:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D9DB0404B5; Sat, 18 Mar 2023 23:50:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D9DB0404B5 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ci8JNGhr 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 a4wRg-4DELAt; Sat, 18 Mar 2023 23:50:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id A1702404C4; Sat, 18 Mar 2023 23:50:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A1702404C4 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B3185C008F; Sat, 18 Mar 2023 23:50:41 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6A43DC008D for ; Sat, 18 Mar 2023 23:50:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3B99481EAE for ; Sat, 18 Mar 2023 23:50:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3B99481EAE Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ci8JNGhr 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 0Sn3VmCn22Qk for ; Sat, 18 Mar 2023 23:50:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 459C681EAD Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by smtp1.osuosl.org (Postfix) with ESMTPS id 459C681EAD for ; Sat, 18 Mar 2023 23:50:37 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id a32so8658150ljr.9 for ; Sat, 18 Mar 2023 16:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679183435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PR2SWFuIhpgHqhYbQ3VgnGaGYYz6kijTWbozvz0B8Rw=; b=ci8JNGhrXu2yCNbR7fs6QD9AyOF35LUxpwQIVgSN51rFXr8KcCRkU2FLtRg22LKOtc yObeUHyqclK/GMNIV3RkzKtfg2hjLHfidWmJ0ivAcSmIsWfD+C1JGtJ5CsIdjOnhgD/3 slRuKtqVaCuKSzRRnGpZHFuuXDrVZXLsAlugGuDVKN1KAqFyOO18DofieXi0tL5JA39J fbmA/P2y/Z/NKtpeE+slTJns4YJ/uFdaDIFavEyNh2St8fhc8rlLHpbBSlO57t53TZBu qtPgyMH0RsvUKOc/HHNh/zwgeNE7gIqvNSAgdodbVOHc/aqqqk9SHZGrTpHaq9J6FhW4 NzJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679183435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PR2SWFuIhpgHqhYbQ3VgnGaGYYz6kijTWbozvz0B8Rw=; b=jgT0OXV8fK53IC9CfCx67/jG0xJhrJ33YAz6alIdIX/ShpKBG+A2tcvnGo7r2WCuTO 5q1g9pQI8AN4d6QaThTymR6zgq+OH1NCprtxefM+hSUKlGGgc8o2UleWPqPjccM3tpW5 oMRxldZ1EtvyLm7X3ajtWTf9BybLj2QokQLsoRPinhrr43MdHydtR4Oexy5xJVVqa1xy E8onUbE8Lh2Wk1iQ5Rc7NnNErKaAKf5lonRlfY55LNqUYx/9tiVHGc/d1HSZvR+F621L c8qzVf8krv/edYZ5rcxQh7+UGnTqKUIp/v66oyIEXQ+3MMm2axpQijbdeufK99nrBZP2 HvIA== X-Gm-Message-State: AO0yUKVZ19hBxYEz/+0/G/k1f/jlfGabbKKJeLc7n7LVEsKi9r5W0BNI JuJA5KdKbQlAMWkzwE1It4sHmuoTFOA= X-Google-Smtp-Source: AK7set+ToyN6yd0T9wKTbUtKjagRjQI5p+SFklgN/35cmLmfTXxGZO95KH+k+gwtXF7bMZDBps3EOg== X-Received: by 2002:a05:651c:b1e:b0:295:9517:b98f with SMTP id b30-20020a05651c0b1e00b002959517b98fmr2459511ljr.15.1679183434656; Sat, 18 Mar 2023 16:50:34 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id v6-20020a2e9f46000000b0029c13f4d519sm162007ljk.119.2023.03.18.16.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 16:50:34 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 02:50:27 +0300 Message-Id: <20230318235031.3793301-3-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 2/6] ic: add support to configure ovsdb inactivity probe 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" IDL to local AZ DBs (OVN_Northbound, OVN_Southbound) should be configured in NB DB, table NB_Global, column options:ic_probe_interval. IDL to global DBs (OVN_IC_Northbound, OVN_IC_Southbound) should be configured in IC NB DB, table IC_NB_Global, column options:ic_probe_interval. Signed-off-by: Vladislav Odintsov --- ic/ovn-ic.c | 28 ++++++++++++++++++++++++++++ ovn-ic-nb.xml | 14 ++++++++++++++ ovn-nb.xml | 13 +++++++++++++ 3 files changed, 55 insertions(+) diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c index 1d0a062f6..feb100859 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -35,6 +35,7 @@ #include "lib/ovn-util.h" #include "memory.h" #include "openvswitch/poll-loop.h" +#include "ovsdb-idl.h" #include "simap.h" #include "smap.h" #include "sset.h" @@ -1871,6 +1872,31 @@ update_ssl_config(void) } } +static void +update_idl_probe_interval(struct ovsdb_idl *ovn_sb_idl, + struct ovsdb_idl *ovn_nb_idl, + struct ovsdb_idl *ovn_icsb_idl, + struct ovsdb_idl *ovn_icnb_idl) +{ + const struct nbrec_nb_global *nb = nbrec_nb_global_first(ovn_nb_idl); + int interval = -1; + if (nb) { + interval = smap_get_int(&nb->options, "ic_probe_interval", interval); + } + set_idl_probe_interval(ovn_sb_idl, ovnsb_db, interval); + set_idl_probe_interval(ovn_nb_idl, ovnnb_db, interval); + + const struct icnbrec_ic_nb_global *icnb = + icnbrec_ic_nb_global_first(ovn_icnb_idl); + int ic_interval = -1; + if (icnb) { + ic_interval = smap_get_int(&icnb->options, "ic_probe_interval", + ic_interval); + } + set_idl_probe_interval(ovn_icsb_idl, ovn_ic_sb_db, ic_interval); + set_idl_probe_interval(ovn_icnb_idl, ovn_ic_nb_db, ic_interval); +} + int main(int argc, char *argv[]) { @@ -2071,6 +2097,8 @@ main(int argc, char *argv[]) state.paused = false; while (!exiting) { update_ssl_config(); + update_idl_probe_interval(ovnsb_idl_loop.idl, ovnnb_idl_loop.idl, + ovnisb_idl_loop.idl, ovninb_idl_loop.idl); memory_run(); if (memory_should_report()) { struct simap usage = SIMAP_INITIALIZER(&usage); diff --git a/ovn-ic-nb.xml b/ovn-ic-nb.xml index a693611c3..8c53bec3b 100644 --- a/ovn-ic-nb.xml +++ b/ovn-ic-nb.xml @@ -47,6 +47,20 @@ This column provides general key/value settings. The supported options are described individually below. + + +

+ The inactivity probe interval of the connection to the OVN IC + Northbound and Southbound databases from ovn-ic, in + milliseconds. If the value is zero, it disables the connection + keepalive feature. +

+ +

+ If the value is nonzero, then it will be forced to a value of + at least 1000 ms. +

+ diff --git a/ovn-nb.xml b/ovn-nb.xml index 73f707aa0..fd32070f2 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -202,6 +202,19 @@

+ +

+ The inactivity probe interval of the connection to the OVN Northbound + and Southbound databases from ovn-ic, in milliseconds. + If the value is zero, it disables the connection keepalive feature. +

+ +

+ If the value is nonzero, then it will be forced to a value of + at least 1000 ms. +

+ +

When used, this configuration value specifies the time, in From patchwork Sat Mar 18 23:50:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758584 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=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=KORRiqdC; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfHnQ3jtyz1yWp for ; Sun, 19 Mar 2023 10:50:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C6B5F415FC; Sat, 18 Mar 2023 23:50:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C6B5F415FC Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=KORRiqdC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BsoNvJ11o4kN; Sat, 18 Mar 2023 23:50:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 176CC415EB; Sat, 18 Mar 2023 23:50:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 176CC415EB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 62F05C0093; Sat, 18 Mar 2023 23:50:42 +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 4D8B2C008D for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2952A60E5D for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 2952A60E5D Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=KORRiqdC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mO6-empp4UMd for ; Sat, 18 Mar 2023 23:50:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 399CA60ADD Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by smtp3.osuosl.org (Postfix) with ESMTPS id 399CA60ADD for ; Sat, 18 Mar 2023 23:50:38 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id y14so8667600ljq.4 for ; Sat, 18 Mar 2023 16:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679183436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6lpJ5HABEiwrQQH1W6A2nBORmt5bXuaG8VhyiPBcC64=; b=KORRiqdCTETf63cW7a645LhlpgmdOqwCQqHR/ZYjy5NkXLAs9Efo+8CpDF3ePw7WLt LriXlvtad9GEgM7847yZ/RLmwi4/hWK+cPWJSHv/j1u6wTLnXDn7sdZpCCkSU9x8O3IB MFdl41qWGXEgUqba7g+j4S6V68F4zXu3Nn/jhEbfehK6YisPJi5V0INaK7rRNPhm9F42 m7Gf3VhYLTf0Il0mQsw4NMBkJYSKoHzbBDI33i2l887w9N5uA0dwzeEEhUEm6f3y8aqd Rd3npUDcwEOaMsYkrzZs0B0GE2JZJocs/dekgl0LDR2qQYSN4VClSlcgON9PXxZ+yE1a pzig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679183436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6lpJ5HABEiwrQQH1W6A2nBORmt5bXuaG8VhyiPBcC64=; b=cMDE2cR95guOwQlwnmfYjRm/xpn5eFj46C43zTu1nSABTtG51YohCQkafuSZ/sCD3u R5WFiYfBopCiYGX0KTXzrwjWVR9iPYDCRRmFphXau2m/9lAR+5Ngjq2XvTDdjOVmwUJw WcSmCQw0uztp5JZmQbquqBe6x1O2WpeK9lKS1IzjvVpiM0y23+V92vWMFyRpXQuw3wiL +lNlKpumcKgVQMWtUFq1AHBXwIkVsH3pw8HO5bzGrWSfYBHFF0dnrqEH3Ahi+qqyYO/R vDU8TwaR+VbmKOG3VBVuZmvywn3gmSVP4c5UprGlzcpXJbHC6wtDXEXJUiF0gCSyGdj1 /UDQ== X-Gm-Message-State: AO0yUKU1JPfTDVuxw1diUBAiOsb+Wq9u1307xu/BW1RLz8zHQTH60r8+ BR3UNEOQ6dQvq8TAQBHjC/HE70xw9Y0= X-Google-Smtp-Source: AK7set8itqgzbtQFYqM738yxjpzkLPH252bgpOJjAdUkvSKfGGNOBDq2IMsvUqMIWciC2GRoW9m82Q== X-Received: by 2002:a2e:b819:0:b0:295:a932:8e40 with SMTP id u25-20020a2eb819000000b00295a9328e40mr4125095ljo.17.1679183435543; Sat, 18 Mar 2023 16:50:35 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id v6-20020a2e9f46000000b0029c13f4d519sm162007ljk.119.2023.03.18.16.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 16:50:34 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 02:50:28 +0300 Message-Id: <20230318235031.3793301-4-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 3/6] controller-vtep: add support to configure inactivity probe interval 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 patch adds new configuration option for ovn-controller-vtep service to supply OVSDB (only OVN_Southbound DB) probe interval value. It can be configured through Hardware_Vtep database, Global table, column other_config:ovn-remote-probe-interval. Signed-off-by: Vladislav Odintsov --- controller-vtep/ovn-controller-vtep.8.xml | 14 ++++++++++++++ controller-vtep/ovn-controller-vtep.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/controller-vtep/ovn-controller-vtep.8.xml b/controller-vtep/ovn-controller-vtep.8.xml index 0b9987bdb..89acae7ed 100644 --- a/controller-vtep/ovn-controller-vtep.8.xml +++ b/controller-vtep/ovn-controller-vtep.8.xml @@ -96,6 +96,20 @@ connected hardware_vtep database changes. The default value is considered false if this option is not defined. + +

other_config:ovn-remote-probe-interval
+
+

+ The inactivity probe interval of the connection to the OVN Southbound + database, in milliseconds. If the value is zero, it disables the + connection keepalive feature. +

+ +

+ If the value is nonzero, then it will be forced to a value of at + least 1000 ms. +

+

diff --git a/controller-vtep/ovn-controller-vtep.c b/controller-vtep/ovn-controller-vtep.c index 26f8fd115..8023bb869 100644 --- a/controller-vtep/ovn-controller-vtep.c +++ b/controller-vtep/ovn-controller-vtep.c @@ -31,6 +31,7 @@ #include "openvswitch/poll-loop.h" #include "simap.h" #include "ovsdb-idl.h" +#include "smap.h" #include "stream.h" #include "stream-ssl.h" #include "unixctl.h" @@ -88,6 +89,20 @@ check_northd_version(struct ovsdb_idl *vtep_idl, struct ovsdb_idl *ovnsb_idl, return true; } +/* Set probe interval, based on user configuration and the remote. */ +static void +update_idl_probe_interval(struct ovsdb_idl *ovn_sb_idl, + struct ovsdb_idl *vtep_idl) +{ + const struct vteprec_global *cfg = vteprec_global_first(vtep_idl); + int interval = -1; + if (cfg) { + interval = smap_get_int(&cfg->other_config, + "ovn-remote-probe-interval", interval); + } + set_idl_probe_interval(ovn_sb_idl, ovnsb_remote, interval); +} + int main(int argc, char *argv[]) { @@ -179,6 +194,8 @@ main(int argc, char *argv[]) simap_destroy(&usage); } + update_idl_probe_interval(ovnsb_idl_loop.idl, vtep_idl_loop.idl); + if (ovsdb_idl_has_ever_connected(ovnsb_idl_loop.idl) && ovsdb_idl_has_ever_connected(vtep_idl_loop.idl) && check_northd_version(vtep_idl_loop.idl, ovnsb_idl_loop.idl, From patchwork Sat Mar 18 23:50:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758586 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=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=K9oe5sJo; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfHnT1Mq3z247b for ; Sun, 19 Mar 2023 10:50:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AECF282117; Sat, 18 Mar 2023 23:50:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AECF282117 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=K9oe5sJo 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 29Ahl2epqLto; Sat, 18 Mar 2023 23:50:49 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5F68382066; Sat, 18 Mar 2023 23:50:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5F68382066 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A9DB1C009B; Sat, 18 Mar 2023 23:50:44 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 88C31C0035 for ; Sat, 18 Mar 2023 23:50:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B9FEB4048C for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B9FEB4048C Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=K9oe5sJo 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 PyJQq4E5246t for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D48054047D Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by smtp2.osuosl.org (Postfix) with ESMTPS id D48054047D for ; Sat, 18 Mar 2023 23:50:38 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id l22so8642942ljc.11 for ; Sat, 18 Mar 2023 16:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679183436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Do1d7yOFu8+Lt66ZHJLFeAyJCD0dM9UVhbZZyAx/FZQ=; b=K9oe5sJohvAPOz0WurmYy5jjpiE4lFRHoXKV6u1DkKE9u4f8WsXdS3RrygEJUFzD0d c7/3xKqp9ApOP/fB+iFiNwhKHgVtdtYZD1ItKWTPW8EOq9KfIfqojZ9Sh1jHwhiCVA92 W5MAVyy0I6qndHWzanzEzwHUJElgR0Sy5t0DLK5twgUZ4rWZTPo9htUD6uPn7zUtK78T O2y3DlJKhpFapajjSoPjauQ8zFKJX54WsQ7/4lRSfUwzwgc6HB/kySJ7LKwsqHzdDAtk vBC7i5NJeiQNejq2b4vPULsyXpwAeLInTdYNTi1lzn3dn2NIQdRuqzyed6dmyfKxVRlm X0tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679183436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Do1d7yOFu8+Lt66ZHJLFeAyJCD0dM9UVhbZZyAx/FZQ=; b=aaIPgigVDat9HuqHKiLK1bkAPPzlPgtiDV8o+Qhyr6YMTU2cc1TdcjOsVNZG/smkGf xSWGgZ1dKgQYxzoV/uqer1srrD+Uo0kLWCpo2V5N46CJDRuLVN1eXYyVRBOq4Ijn6NG9 y3uBHhNV2ipKq+qaDlVYnG6iyBKpte/7RHc9Y2l3RDsbbGvmQNM3yU2bb5s5fd73mFoM wew8W5gjgeCvXSAsRh5wuT+icXfOfGL0oy3X+kW8HihksnQmUj/t1eoD8nmCnQJZzcC/ JlSusvQgLi31oq08UHv8z2XliazaQcjFTLBOJXdKXIOI1P7CnzAhB2GyZE0vAJiJt7FJ tqmA== X-Gm-Message-State: AO0yUKW8sxknAv6hG3v43kLkAmSctZ49G2Lj1Kbi0C7jcY0h2JxRU7LY +5QZM6zEsWKzYFIgHOkwqIoiO/bOfWtxgA== X-Google-Smtp-Source: AK7set814mLgUZqdZW8anB6cttH7jfZn2IqWYxtVOf1oQ1JIcB/DbNoFS5WcHCiA0S/9Nxh6GhQ+5Q== X-Received: by 2002:a05:651c:550:b0:290:6e01:8d0b with SMTP id q16-20020a05651c055000b002906e018d0bmr5958342ljp.26.1679183436185; Sat, 18 Mar 2023 16:50:36 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id v6-20020a2e9f46000000b0029c13f4d519sm162007ljk.119.2023.03.18.16.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 16:50:35 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 02:50:29 +0300 Message-Id: <20230318235031.3793301-5-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 4/6] controller-vtep: add unixctl commands to show DB connection status 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" New unixctl commands were added: - sb-connection-status - vtep-connection-status Signed-off-by: Vladislav Odintsov --- controller-vtep/ovn-controller-vtep.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controller-vtep/ovn-controller-vtep.c b/controller-vtep/ovn-controller-vtep.c index 8023bb869..5f017d87d 100644 --- a/controller-vtep/ovn-controller-vtep.c +++ b/controller-vtep/ovn-controller-vtep.c @@ -175,6 +175,11 @@ main(int argc, char *argv[]) char *ovn_version = ovn_get_internal_version(); VLOG_INFO("OVN internal version is : [%s]", ovn_version); + unixctl_command_register("sb-connection-status", "", 0, 0, + ovn_conn_show, ovnsb_idl_loop.idl); + unixctl_command_register("vtep-connection-status", "", 0, 0, + ovn_conn_show, vtep_idl_loop.idl); + /* Main loop. */ exiting = false; while (!exiting) { From patchwork Sat Mar 18 23:50:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758585 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=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=SU9fiQu1; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfHnS5dGTz1yWp for ; Sun, 19 Mar 2023 10:50:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E5F6A4171F; Sat, 18 Mar 2023 23:50:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E5F6A4171F Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=SU9fiQu1 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hqojvTKGcbP1; Sat, 18 Mar 2023 23:50:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 573D14161B; Sat, 18 Mar 2023 23:50:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 573D14161B Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 94BA1C009C; Sat, 18 Mar 2023 23:50:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2ADCBC0035 for ; Sat, 18 Mar 2023 23:50:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id EA7BA81ECC for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EA7BA81ECC Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=SU9fiQu1 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 aNgejIEEW_ev for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 15B7E81EAD Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by smtp1.osuosl.org (Postfix) with ESMTPS id 15B7E81EAD for ; Sat, 18 Mar 2023 23:50:38 +0000 (UTC) Received: by mail-lj1-x232.google.com with SMTP id e11so13601lji.8 for ; Sat, 18 Mar 2023 16:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679183437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3ZcMaYXilYF3DAqwueQa5ylW4v/b8FQ96UcNqAy7Zig=; b=SU9fiQu13DQJZOMi+8iJuWJt6DsMC/L0EmNX8FEKwNEmtXZT4kocxm6k86z9Jq6of3 r6BbkrQLI6gESEMJuCU0eP8vdd6Q2TJFUBL2BrWtFlqEthyibUIouxXhdRf0x0zA1wCd 15r/r8lBICnaSi01HO0qIuu5QnH1z8/cRISwhHWztXxQrkxrWI1bmKm6Vbtb0FV3Elez 46BG/XWBVsJ1HSVvdWtjQWJoVaPurMGOmbhCMIUHdBB697QJzCJhHOdJD6JMbn4aYl/f 0sgAcqWGJKsSpUt/lnrXfV+I01KcmAuCDqJwO9sgmpy6FARF1h+9XUYk3VaYTWr4X8HF KiJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679183437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3ZcMaYXilYF3DAqwueQa5ylW4v/b8FQ96UcNqAy7Zig=; b=Hbs7bKx+7PooPcdR4hyAXFnh+0ZttLUfByeONbIy1r7MJUGF5+xP4KolCYtMPMWUHp PghZGvn7CNnx+4tZ1geAkz3oS0MBIWgFvhE/bYRHU39/9HkP/SjwKpnKMHO7WbJPnaa+ jrZ1m5DL88pty09wkZGEYtQv5kDBp/HMIYl6qa6v+thW3u2PVeYRlQ9VYWp12xAODZ7I rpX2zaGlQGbFqC/nwXnvYajfmOMXp0eUkmtOxy6NPnF3ePThF/ub29gy9JwKC6n4VbXb TIWyYPt5mOouB0xVUtxd4kJgzVin71k5/710DJ2rTyWBh/JJ+5VqHulv1c68maMH9k0q WKcQ== X-Gm-Message-State: AO0yUKWZErPz6CHxLg2Vnk1uIfsksAnCH1zYIf+2KWumSp8Pwuhk3xGT /w7AbIwBWgp70USNLPkQTMMeXr5Xdik2eQ== X-Google-Smtp-Source: AK7set+SS/KSgk9KadmB7dNzdfLX0+JVrgqXsK8iL17OOnSFy2q99tVIZU/SMfsLdqm0W773KdEsZA== X-Received: by 2002:a2e:9113:0:b0:299:43c3:5a2b with SMTP id m19-20020a2e9113000000b0029943c35a2bmr3716718ljg.33.1679183436840; Sat, 18 Mar 2023 16:50:36 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id v6-20020a2e9f46000000b0029c13f4d519sm162007ljk.119.2023.03.18.16.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 16:50:36 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 02:50:30 +0300 Message-Id: <20230318235031.3793301-6-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 5/6] ovn-ic: add unixctl commands to report db connection status 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" New unixctl commands were added: - nb-connection-status - sb-connection-status - ic-nb-connection-status - ic-sb-connection-status Signed-off-by: Vladislav Odintsov --- ic/ovn-ic.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c index feb100859..6f31037ec 100644 --- a/ic/ovn-ic.c +++ b/ic/ovn-ic.c @@ -2091,6 +2091,15 @@ main(int argc, char *argv[]) &icsbrec_route_col_transit_switch, &icsbrec_route_col_availability_zone); + unixctl_command_register("nb-connection-status", "", 0, 0, + ovn_conn_show, ovnnb_idl_loop.idl); + unixctl_command_register("sb-connection-status", "", 0, 0, + ovn_conn_show, ovnsb_idl_loop.idl); + unixctl_command_register("ic-nb-connection-status", "", 0, 0, + ovn_conn_show, ovninb_idl_loop.idl); + unixctl_command_register("ic-sb-connection-status", "", 0, 0, + ovn_conn_show, ovnisb_idl_loop.idl); + /* Main loop. */ exiting = false; state.had_lock = false; From patchwork Sat Mar 18 23:50:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758587 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::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WsdZDGPj; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfHnX2ht0z1yWp for ; Sun, 19 Mar 2023 10:50:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 16D6042290; Sat, 18 Mar 2023 23:50:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 16D6042290 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WsdZDGPj 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 NMf3bYb3BoWm; Sat, 18 Mar 2023 23:50:52 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 11EDC40983; Sat, 18 Mar 2023 23:50:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 11EDC40983 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6A389C00A2; Sat, 18 Mar 2023 23:50:45 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4D143C0077 for ; Sat, 18 Mar 2023 23:50:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8C1A281EAD for ; Sat, 18 Mar 2023 23:50:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8C1A281EAD Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WsdZDGPj 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 MnB6HNZRvpT7 for ; Sat, 18 Mar 2023 23:50:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C987581EC0 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by smtp1.osuosl.org (Postfix) with ESMTPS id C987581EC0 for ; Sat, 18 Mar 2023 23:50:39 +0000 (UTC) Received: by mail-lj1-x235.google.com with SMTP id z42so8642342ljq.13 for ; Sat, 18 Mar 2023 16:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679183437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BthbzraFpeKb7OEpx8lbgpVtFs3QQ0R4wxxByrmtiJo=; b=WsdZDGPjclzNFYG1nzI6GApcFXpT7GZ8hfPjcL07pI8Avw5n1ZkXUB5l+UyAJFxJcV 7Bo3z6FwhOjY52WWGYQya5isQ3k8boXxLzMQk4PK6oNhIiNgVLJYY4UiSXtV6csSVd1Z IzEyldN3yr1cijiflxnxA44wVKVi3/sd/5jN/iH1NteA3385rZOgObAXmgb0WgCBbkL2 f8ikZzFEcp2x4HYIgxF59DZvsUxYbRGED+PeoDpmzTwRnKQFrOUifgLvy6oXU0+1it6K KRX9DFWa9C3z3EoP6AP30yY/eFbhkCXyvjT+RdcrMbsa7/tGmBItieCS0qRNpsZb6acc KlYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679183437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BthbzraFpeKb7OEpx8lbgpVtFs3QQ0R4wxxByrmtiJo=; b=XWMoYBbtsbshNCM6cwYQbrj1pdfctlnXHkOSPNRq9cawyPtpnOU/LSAHqDD01tfW5X jpLGcHIVMkFQAvQda1TfCS4XMzO3fh+jOhaH5NTkbGysErwL0pDCdv3JBFMcPRI07B7A oE2RleYZdYWhCV96LGs0cAibDvYJketp3tZiaUM/Q+YjASxMKIJPlQ9/ngXrSuNprI/7 1lWlKS0dsuIlQNJbilzP0eB53qPgLPborrwzXdGYdo73uRCoZM59OMSg3oOlXGZ4HjUR 5gDmiwHWkq6OPkrdsWp/sAiqeXSMgYcrvjBG8+oOD5MDG+J9Dy932Q4m87eDZixiLUNi DHIA== X-Gm-Message-State: AO0yUKWCfW3q8YaE9UMzVqQvQKShcz+iy4jh06TZeGN+9Lm4FEdTQNPu b00TN+2t+GQ5+Zrb2DLvrQ8V/WUD2Nvkgg== X-Google-Smtp-Source: AK7set9vabKJ9bC4N9KbgnyhdDjia3xz5McvMlvqdTqAbkt/9TcnKImmxSA9SSpamilTWbVhEki+Aw== X-Received: by 2002:a2e:7807:0:b0:29b:d471:c817 with SMTP id t7-20020a2e7807000000b0029bd471c817mr708730ljc.12.1679183437570; Sat, 18 Mar 2023 16:50:37 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id v6-20020a2e9f46000000b0029c13f4d519sm162007ljk.119.2023.03.18.16.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 16:50:37 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 02:50:31 +0300 Message-Id: <20230318235031.3793301-7-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 6/6] NEWS: add info about ic/controller-vtep inactivity probe support 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" Signed-off-by: Vladislav Odintsov --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 637adcff3..fc1b68324 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ Post v23.03.0 ------------- - Enhance LSP.options:arp_proxy to support IPv6, configurable MAC addresses and CIDRs. + - Add support to configure OVSDB inactivity probe interval for ovn-ic and + ovn-controller-vtep. OVN v23.03.0 - 03 Mar 2023 -------------------------- From patchwork Sun Mar 19 00:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1758592 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::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=eWDyga/u; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PfKdt2bPVz246f for ; Sun, 19 Mar 2023 12:14:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6C3A4415EB; Sun, 19 Mar 2023 01:14:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6C3A4415EB Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=eWDyga/u X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jM_-pGS46g18; Sun, 19 Mar 2023 01:14:21 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 37D6B4049C; Sun, 19 Mar 2023 01:14:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 37D6B4049C Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 009FBC0035; Sun, 19 Mar 2023 01:14:20 +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 DFD90C0032 for ; Sun, 19 Mar 2023 01:14:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id ACBE6404A6 for ; Sun, 19 Mar 2023 01:14:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org ACBE6404A6 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RxrLeGgg24qv for ; Sun, 19 Mar 2023 01:14:17 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 22FCA4049C Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by smtp4.osuosl.org (Postfix) with ESMTPS id 22FCA4049C for ; Sun, 19 Mar 2023 01:14:17 +0000 (UTC) Received: by mail-lf1-x12c.google.com with SMTP id bp27so10899424lfb.6 for ; Sat, 18 Mar 2023 18:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679188454; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VrC4qCoucgUoreC+t6pFEfZt8lcgTc9M4/5NU7ItXbw=; b=eWDyga/uge7bNDlJDJILLCilH/JH7inal+7lmS5qVq/uC7/M8vkBBaBRVSKZjsJONe +aWwAP7VRGPDBC8rYRef0oJ57zxrWyI4VyOanuETq39bDPsveaV4uEZy/+ffu33XzKzF LFdIkfZ+n8aSsfgqXkhITmmaplLyPzNWRU7LOPv5MxhBFBsihrRtMONm0IfZiOOPQEWa Ng3bNZrshCqiUqb2SfncFNVS1ZDJ1AUeaoWwrwMK5AKX57AoFocrdgJATka4RBv0oqkf 2QEPqWBHCkBuMnDPa+R1nb9uLWB+hbNcAVqWmhsNe8mrg9L+izTIivyTQDH9OMrhKGN8 D95g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679188454; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VrC4qCoucgUoreC+t6pFEfZt8lcgTc9M4/5NU7ItXbw=; b=6zFhuxOqR0/ai8rsdBpO0EV8GnX7N4vCC/pGpL76jX1ME0ZD7PIFoZKkypYA9jlZbs 5e7z9SiMttZYrCvAnechu6FojHgZEo2/8VToSRcy36a04nsiw4bhQc84H8eYSrlP0BdI TJBpzFvMqR7ZdgHRWgrfBb2i5t8jvthc8T55E/OUNt0gTIQPD3PrhY7X1pMK0RL1zu4i ozg1trSx4f8hcDuJXn8/9az5fKNHYL/6tLrjzLUO+pnQe6K3hEJ/RkJCrtM4LWGw0BtD rBulVD1Om9ur9BySS1mDP5bdxeNwkLu/ZuyTSgNpkY5wMJGkgG2m4GWxzFNX6p1xIF3n 5zBg== X-Gm-Message-State: AO0yUKUrutcazQz1ZZBdy5wqyLmqZ/AGbHzQ1hRUwAZJj1qDfogSTVHC V/osmvBuNx1wbS+5/9AfxlsYHiQ7WXrgIw== X-Google-Smtp-Source: AK7set+5aIe9ikGKdkkHJ3SSFDIXE8nn3uWZR/ec84Xy4ueu/mJJNbCtXmd00o84/MIqgor2j2WNMg== X-Received: by 2002:a19:ac02:0:b0:4e9:609f:256f with SMTP id g2-20020a19ac02000000b004e9609f256fmr1987110lfc.13.1679188454535; Sat, 18 Mar 2023 18:14:14 -0700 (PDT) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id h22-20020a197016000000b004da8168eba2sm1016457lfc.237.2023.03.18.18.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 18:14:14 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Sun, 19 Mar 2023 03:54:27 +0300 Message-Id: <20230319005427.3796325-1-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230318235031.3793301-1-odivlad@gmail.com> References: <20230318235031.3793301-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn 7/6] utilities: disable OVSDB inactivity probes for non-daemon ovn-nbctl 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" For large OVN_Southbound DBs default interval of 5000 ms could be not sufficient. This patch disables OVSDB inactivity probes for ovn-{n,s}ctl running in non-daemon mode. Signed-off-by: Vladislav Odintsov --- utilities/ovn-dbctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utilities/ovn-dbctl.c b/utilities/ovn-dbctl.c index 369a6a663..4307a5cae 100644 --- a/utilities/ovn-dbctl.c +++ b/utilities/ovn-dbctl.c @@ -208,6 +208,9 @@ ovn_dbctl_main(int argc, char *argv[], if (daemon_mode) { server_loop(dbctl_options, idl, argc, argv_); } else { + /* Disable OVSDB probe interval for non-daemon mode. */ + ovsdb_idl_set_probe_interval(idl, 0); + struct ctl_command *commands; size_t n_commands; char *error;