From patchwork Fri Sep 17 03:05:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Wang X-Patchwork-Id: 1529163 X-Patchwork-Delegate: zhouhan@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=XBcQQtiA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H9f3v2r0nz9sSs for ; Fri, 17 Sep 2021 13:06:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 81B9860AC7; Fri, 17 Sep 2021 03:06:16 +0000 (UTC) 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 v_UL74hEtXc2; Fri, 17 Sep 2021 03:06:15 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 946AB607D1; Fri, 17 Sep 2021 03:06:14 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7A830C0011; Fri, 17 Sep 2021 03:06:14 +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 DF089C000D for ; Fri, 17 Sep 2021 03:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C7C8A4157E for ; Fri, 17 Sep 2021 03:06:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=nvidia.com 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 Ie77U9zAfirY for ; Fri, 17 Sep 2021 03:06:12 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2073.outbound.protection.outlook.com [40.107.94.73]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0218B41582 for ; Fri, 17 Sep 2021 03:06:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V/CQVf/NwROdMhESGtE87nr9yHLJOlLfcEYXFT4JJgPaAcBWZWQbbpOkL0c+1LaIfNwszTMbxzSfYCNfQNHgEyoYPkTccFigW1cgto0TExbCZUKUJqFh4mmlIjN4Feg6xoRbLlrnkQzjM6fecmGjwgf/XnZ4tWaljgIiFx4oHRMQcYaA6v6RsyVZlPKg87ND7rXOjV8kp15Ejif0SVCjxfnxKgBDAKTUaWVhVvCgq/b/XURRstuX+snw5+7iS7J9HKWcb4mQE5q2EvJFk8RQbrBJW7e9yftQ4j8q3B438kf6BFPDet6i9dHLVfN+1zF1D+kb7hvnuIySiMEhqTBc+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DQVFCQI5ECCwisD0FKU/VrxEe2XrPaUFSk3LaeYw8zc=; b=IsL9V7dvfhu0yuRrgJpq1mUyWulL51/izTP0upZwiWTfFsSI/ZwCiWTj7NRFAdisZ8krz+K2KOf0RYdVpZ/rv+oZIZ3I+kcjiGeKC25y44z3RQD96qOLKkbAZKSYc5Gz3/M2dkXEdgXDIU3/pBGan1gxpmYL1Uodgl+aBIxGsFCYcxP04EHQgDsL7O/GftPWPVetaN1e5ADQbc8myyFjYYnWJ6W2PuTRrZ+bhvKBOuIq97oRyhmsJxZTQnAFwlXCeVOdLNrq0H8WpCZmSC7CJsSjq7nu3rQ84gl13mkq8zPZ2GLT4DVnZrJ/9iqddtQxdQoLoFRJPnw4+4Jfa4pGZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=openvswitch.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DQVFCQI5ECCwisD0FKU/VrxEe2XrPaUFSk3LaeYw8zc=; b=XBcQQtiA3idmZTteDa3je8H6P629wAHdXo/MyXXBBqcAYQ8DObyf+mWApr9Eyzyhvx2uFja4uRjRftVEBg9XmUrNEN3a1rPtRhL3l/5GRLRnpqTFPdpldEd+kRBObOvybRGi9rdTuj2WsvrW4bHy8leq+qjPI2N4tt/sq3rjcucnTKd0rMLdngfC6tUKVIE9tf1xFjPobmmkyNvY/cA1NG4ovl0bJQ+oT9PMouvD2f/fO+CxIyp0L+sHkJoMaGPzfWEOc0dsEDbipRSfYH0OPe8Fr3Ow2aZpKjD5wNqSH4KV/m5LgbtYPol52OxtzxxjZpMh2BGMAg0t5mQtU2iPTw== Received: from DM5PR12CA0071.namprd12.prod.outlook.com (2603:10b6:3:103::33) by BYAPR12MB3111.namprd12.prod.outlook.com (2603:10b6:a03:dd::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Fri, 17 Sep 2021 03:06:10 +0000 Received: from DM6NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:3:103:cafe::73) by DM5PR12CA0071.outlook.office365.com (2603:10b6:3:103::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 03:06:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) smtp.mailfrom=nvidia.com; openvswitch.org; dkim=none (message not signed) header.d=none; openvswitch.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by DM6NAM11FT031.mail.protection.outlook.com (10.13.172.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 03:06:09 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 16 Sep 2021 20:05:21 -0700 Received: from winson-X299-A.nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 17 Sep 2021 03:05:21 +0000 To: Date: Thu, 16 Sep 2021 20:05:38 -0700 Message-ID: <20210917030538.9773-2-zhewang@nvidia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210917030538.9773-1-zhewang@nvidia.com> References: <20210917030538.9773-1-zhewang@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e012230-8988-4e11-4f6e-08d97988190f X-MS-TrafficTypeDiagnostic: BYAPR12MB3111: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:660; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3cYf/Z826ZvFPOkgZLy6mW2QgyszPBk5vUaDcpYq5I+q59rG2XqkZPV8b5xkBpJRMwp4laOOGAqyI09d8+TOkUuLs4U8C0+pyBuUdv8D2DPMolWkejr/A+VoOGAKJIxN0nXrepA5ZHINYHHuGBWdK2EqQ/OFFq4znClKuv5ussNzhVAwlp4jBvf+MGhDTQre/Qa6UH5bVlbbOl2Dv1k9dUuTcv7GatKf3HdPuYV4PigjiAW272U5IoU8E5B6Jzu3rqVdMlHVMY72fK8D+VJe5d+QUIvjTvHO6WjkxEi7Yb1R/ir/H0kRAzP1gcWzcnelLj6HfF4NaRFfHF567kq5QQnZkLsYGINCMISQUM8vp4F7oY6hd3woZbPldfkfO+Qks2q0bgBFI248OfT6Cf4y5bbtvSMdaBpa/tGKp0Y5whY1sjTFUB4A6dZSjYYjig9b6ySZp7dVRctZje6WX3esA2RL/V5rvwbyxjhZoo1iTqFIu542jhNihIAjnXaJ8xMcD0rS7lo9CsD6dA9d84MgEYcux6mKTLihWnUmQfxVpljr0sRNw0uKuPSmonn3ZM5DC//kRV3pC72T+/j28Il1Ut6K5w9nMl7+MZYmmFmdklc7Gp3PxEKqhmTabyjc2hNCWGd6MwhuQwF0t9ekR/WvDhAbEt/Skpj5XVCMxKUKjLF5/0vRfTkmDGQs4A97nLMhIiGe0wfJYa7MqQYr0DET6Q== X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(26005)(86362001)(47076005)(6916009)(16526019)(6666004)(15650500001)(186003)(107886003)(36756003)(5660300002)(2906002)(336012)(7636003)(70586007)(70206006)(83380400001)(356005)(82310400003)(426003)(36860700001)(316002)(8676002)(508600001)(1076003)(8936002)(2616005)(54906003)(4326008)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 03:06:09.0993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e012230-8988-4e11-4f6e-08d97988190f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3111 Cc: zhen wang Subject: [ovs-dev] [PATCH ovn 2/2] Update the probe interval in main loop. 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: , X-Patchwork-Original-From: Zhen Wang via dev From: Zhen Wang Reply-To: Zhen Wang Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: zhen wang When ovn-northd work in HA mode, ovn-northd will not update the probe interval in standby mode. This patch address the problem by updating the value in main loop. Signed-off-by: zhen wang Acked-by: Han Zhou --- northd/northd.c | 25 ------------------------- northd/ovn-northd.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/northd/northd.c b/northd/northd.c index b7e64470f..89b0e4921 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -72,10 +72,6 @@ static struct eth_addr svc_monitor_mac_ea; * Otherwise, it will avoid using it. The default is true. */ static bool use_ct_inv_match = true; -/* Default probe interval for NB and SB DB connections. */ -#define DEFAULT_PROBE_INTERVAL_MSEC 5000 -static int northd_probe_interval_nb = DEFAULT_PROBE_INTERVAL_MSEC; -static int northd_probe_interval_sb = DEFAULT_PROBE_INTERVAL_MSEC; #define MAX_OVN_TAGS 4096 /* Pipeline stages. */ @@ -14082,20 +14078,6 @@ build_meter_groups(struct northd_context *ctx, } } -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 void ovnnb_db_run(struct northd_context *ctx, struct ovsdb_idl_index *sbrec_chassis_by_name, @@ -14182,13 +14164,6 @@ ovnnb_db_run(struct northd_context *ctx, smap_destroy(&options); - /* Update the probe interval. */ - northd_probe_interval_nb = get_probe_interval(ctx->ovnnb_db, nb); - northd_probe_interval_sb = get_probe_interval(ctx->ovnsb_db, nb); - - ovsdb_idl_set_probe_interval(ctx->ovnnb_idl, northd_probe_interval_nb); - ovsdb_idl_set_probe_interval(ctx->ovnsb_idl, northd_probe_interval_sb); - use_parallel_build = (smap_get_bool(&nb->options, "use_parallel_build", false) && can_parallelize_hashes(false)); diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 6d4c5defc..0a9fd8190 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -65,6 +65,10 @@ 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 = DEFAULT_PROBE_INTERVAL_MSEC; +static int northd_probe_interval_sb = DEFAULT_PROBE_INTERVAL_MSEC; static bool use_parallel_build = true; static struct hashrow_locks lflow_locks; @@ -577,6 +581,20 @@ 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; +} + int main(int argc, char *argv[]) { @@ -911,6 +929,12 @@ main(int argc, char *argv[]) while (!exiting) { update_ssl_config(); + const struct nbrec_nb_global *nb = nbrec_nb_global_first(ovnnb_idl_loop.idl); + /* Update the probe interval. */ + if (nb) { + northd_probe_interval_nb = get_probe_interval(ovnnb_db, nb); + northd_probe_interval_sb = get_probe_interval(ovnsb_db, nb); + } memory_run(); if (memory_should_report()) { struct simap usage = SIMAP_INITIALIZER(&usage); @@ -1000,6 +1024,11 @@ main(int argc, char *argv[]) poll_immediate_wake(); } + 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); + if (reset_ovnsb_idl_min_index) { VLOG_INFO("Resetting southbound database cluster state"); ovsdb_idl_reset_min_index(ovnsb_idl_loop.idl);