From patchwork Wed Oct 6 19:42:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li,Rongqing via dev" X-Patchwork-Id: 1537390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=comcast.com header.i=@comcast.com header.a=rsa-sha256 header.s=20190412 header.b=IYFnX9s9; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPmk319cRz9sX3 for ; Thu, 7 Oct 2021 07:47:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B3803840FC; Wed, 6 Oct 2021 20:47:52 +0000 (UTC) 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 t_OiE4nt5Bdx; Wed, 6 Oct 2021 20:47:51 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id AF1CD8414E; Wed, 6 Oct 2021 20:47:49 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C7360C0024; Wed, 6 Oct 2021 20:47:47 +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 CC6F7C000D for ; Wed, 6 Oct 2021 20:46:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AE73B40921 for ; Wed, 6 Oct 2021 20:46: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=comcast.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 iVBxcIRbfZMd for ; Wed, 6 Oct 2021 20:46:11 +0000 (UTC) X-Greylist: delayed 01:03:42 by SQLgrey-1.8.0 Received: from mx0a-00143702.pphosted.com (mx0a-00143702.pphosted.com [148.163.145.77]) by smtp4.osuosl.org (Postfix) with ESMTPS id 07E6040920 for ; Wed, 6 Oct 2021 20:46:10 +0000 (UTC) Received: from pps.filterd (m0184894.ppops.net [127.0.0.1]) by mx0a-00143702.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 196J34Yr008325 for ; Wed, 6 Oct 2021 15:42:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.com; h=from : to : cc : subject : date : message-id : content-type : mime-version; s=20190412; bh=7zBKz8DZuCMZ0NGSFtRnmjRKWNBoTx/2fdVLQZfptik=; b=IYFnX9s9bkl/sPS0SEzLUoShMQtEb+Za6Cu9R+6vZGLgRvv0Vg20dS7wzg/qLpyxBuIV dTW3Wp5eeLeDNAkfsIn1MZdqEtNMYVSmJ7vZPvIYLN82TCl9qHzhJ7+Z/3M/7W2K7pRb pCggy4YN2TjP6hGv/U5UmaaXi8S/xTyV+kqzgHjNupfkGPg7MSmhu/1vsudtoOIKEHTc X0JYnD1pAxGYNgKbIhNXaYWS0vQTWpV94wFZNZN8cdXhWhV6ili7Gj4AaJ44+cnu7NBH vZvQVFMPl5iXxzA6s9YetwEapXpo5F54asOI4gxrR/tNMXeRcQ6k8RWsr1DU/zuxaHj1 FA== Received: from copdcexop05.cable.comcast.com (dlppfpt-po-1p.slb.comcast.com [96.99.226.137]) by mx0a-00143702.pphosted.com with ESMTP id 3bhetfa1cn-11 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 06 Oct 2021 15:42:29 -0400 Received: from COPDCEXOP03.cable.comcast.com (147.191.124.158) by COPDCEXOP05.cable.comcast.com (147.191.124.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.858.15; Wed, 6 Oct 2021 12:42:24 -0700 Received: from COPDCEXEDGE01.cable.comcast.com (96.114.158.213) by COPDCEXOP03.cable.comcast.com (147.191.124.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.858.15 via Frontend Transport; Wed, 6 Oct 2021 12:42:24 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.175) by webmail.comcast.com (96.114.158.213) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Wed, 6 Oct 2021 13:42:13 -0600 Received: from BN9PR11MB5385.namprd11.prod.outlook.com (2603:10b6:408:11a::11) by BN6PR11MB4147.namprd11.prod.outlook.com (2603:10b6:405:80::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Wed, 6 Oct 2021 19:42:03 +0000 Received: from BN9PR11MB5385.namprd11.prod.outlook.com ([fe80::6cf2:e6c6:3613:2544]) by BN9PR11MB5385.namprd11.prod.outlook.com ([fe80::6cf2:e6c6:3613:2544%7]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 19:42:03 +0000 To: "dev@openvswitch.org" Thread-Topic: [PATCH] connect: Add min_backoff parameter to the Manager table Thread-Index: AQHXuugB7UewVOnMH0qfN5yxxqz1NQ== Date: Wed, 6 Oct 2021 19:42:03 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: ef8efd7f-de3d-8804-cbb0-1210bbe99e2d authentication-results: openvswitch.org; dkim=none (message not signed) header.d=none;openvswitch.org; dmarc=none action=none header.from=comcast.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c1008614-61c7-43c8-3a7e-08d989015f28 x-ms-traffictypediagnostic: BN6PR11MB4147: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:494; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wPrPTNG7AA1FnDp0FZvFcKiQs1Ig6cK4UvlxH6aysRN9ex4cSv6LfRnGLM/ier6oe1ZW0WiUmqOLSI4eWsNYQuYuxA+E//3n19ciKU0zciIrExQnBqwOv/0icF/peGaTuu5VEgt6scWDTZq4tjJ9PN9G/1oWV9dW8iC+dUx09lbF/9dIoDOvZN+LVUzEOd5vcMGfub94CjJdS+C2dPJTzwBt3F7ey2ulh5v6UiuVid2+S4zpmZio86YAq3NaOt/hunEU94sYO9YRZd7CjeFNfLosukivwOnBXd1ZCMiofHaVN1ASKSnfLn7TpryCIhRaP5c/4p/fAGmptQCS4FfcA//eCK3/lYgOoShhRtUmOIliCukiakzhd+HQMEJVuzYkH7PnMQlxFE7XdityAAaAXv7JNRN7ZvxvBEJ0ybcrQC6WVzQHVPFruxF+adID6xhZ7LeuuolGt4iBem1h9AxAkNxGznan6MqkDL+qYPRB/iH5qrsz/Sg+alwgtg639X5rScwCRhaAmaUNcgYn0F79Eb+Qk16KXQa8x97bWILBq2ZSqmkuX5eGnivHVn9mJDqnC/wTVqftePgWn+jScBKyVN+At2X42IhWfmshyRfniPUGaLDc48zYhz7dI9PuJQOknhEe0TgOd5hW8QK1Qqp4yVUzr+xLG2XiH7E19FYxr8wTEAM4GwVaE6vnGZZN8BnxlmudAoV1cWO8DTgLM9HOBQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5385.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(84050400002)(5660300002)(508600001)(2906002)(52536014)(107886003)(33656002)(6916009)(8676002)(55016002)(71200400001)(316002)(9686003)(8936002)(4326008)(66446008)(38070700005)(66946007)(83380400001)(6506007)(186003)(38100700002)(122000001)(7696005)(86362001)(64756008)(91956017)(76116006)(26005)(66556008)(66476007)(19627405001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?FbH4quE1REJg+/LOr6rUcir?= =?iso-8859-1?q?Bq3Pg3WGKqS5bbFxg9zELE+z8YPLn7s2mvlepYdoaIrOhg9oyT38Kuy3TqR9?= =?iso-8859-1?q?BFCTg86yy3uRNmsMkl3kSUZzE9EcfiCogBxFPWJ2Z/vzfpJDaT3OoiKgrNSf?= =?iso-8859-1?q?AjJ1IXzahXxjSaWvHRJlq0ZOytF4FDsFUblZTqFFER9zrMWQCC1pc4fb1XHN?= =?iso-8859-1?q?j46P0XiyK/QX4Y8ltOAr5ilzr0segHjjZLIu5fqiqm9xYl21mkmM3UL21bBd?= =?iso-8859-1?q?5jHc3PCXMkO78NLXarWV37VcEjAlkINf5JHCa6ENSJtjCLXITz7oq0Llf25I?= =?iso-8859-1?q?anexNtfiNGB73qHRjFp5ZFzcBHWlMDUOiTovyHCj50hez+hoqwB5eAM1+AK0?= =?iso-8859-1?q?6GlGfPDceOx0ZXUk9k6yYWSB/xjNIcMHj3CAcX5B7oydPqhaLyzpakhPe4n5?= =?iso-8859-1?q?B4GKfQ1aRdVyF0m2TjqTUMnOXdHR+fsN+Q2hRK8bUGzoBrPsudZnJFcBNUgM?= =?iso-8859-1?q?XD69inoaGa8MHbXBQy/WekTUKT9ElDyqCUN99OGdLxmbHk1etXibmssmnDhX?= =?iso-8859-1?q?PRU8mNeF+UGERlm0TLYLknDIGgsaAkTCfxToNIM8roiWF5Vgqr4d6qcCjyaM?= =?iso-8859-1?q?M7NDV+Zf4bJioSXOzq3O4Ss7Gs0XzD/GQngCEAvwZE2Db1LMj7113TJo3Df5?= =?iso-8859-1?q?1R9liW8WfFmEj5wMjUDhLQFvtGWS7+LlELmEKFyNwEcceD0tFVSOydygKtgV?= =?iso-8859-1?q?SR4NfcIxa/hVJrsr5q5yqYTah5q2rZbYb3uRK1oBbVPudEXkxfU+ytB7nVfT?= =?iso-8859-1?q?+/i1KAVeCitX1YqvPqTWCrdWFB5VRC1OPVXW6aecZuED/CsxnETWP3c+ZW9S?= =?iso-8859-1?q?S1eQ0De5DAyybBnnEauVMh20jnjlWVjGyPyRo6FSukp/5RslXlNziqBpNCmz?= =?iso-8859-1?q?QfAooJ1lu/dsC8ZKcecwng3t79IP+1JLvBiLkoGcVedCEdXNKg6PZEdIPSei?= =?iso-8859-1?q?58wiDfy0MVb/xiLwrBFkK7LlO3CXhqobGPgUvHGolqXS9O1S7LcnoresKVq1?= =?iso-8859-1?q?IN2OzFNlGv3EWfYlZpYuW9M0SBJ9xqIDOPMRswWNMNaIuO/EVvnh17jtYH0L?= =?iso-8859-1?q?UcZzd+FznXJzMhbizZPPu3J3VwuovkKqz5LBOHCDBGdZ4PrM7ay0gyAq2ipq?= =?iso-8859-1?q?ojUK/95PgTdGQR5BMMVbK6eKwfKLM83jeqZ0wrCj+G1dav7WsXm7t0aqaq82?= =?iso-8859-1?q?0smyiqILSLopvDFddJuPZecZQtSs4WKuIeVa0Xggd4u5nnEI3skTXyy+rRxZ?= =?iso-8859-1?q?uR6gjKeo2QcyUIwlHid68yKAH1/agPPSnK3YiNSw=3D?= arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gv/xp7q9eOQdAPzQMx/Q1FajiM9ArXXqgFO8XPWYH3kYrQjTReBh/eetwReYICX3l7ejNeMFen8+WN/vKb8qERlVzVOiF8XkESUCMy+Eq6DRQSCe53dmTRstLLhqmOxaHtAo+3gXpCO85oePweD0N3MHzLxN7XbGhA0rSMgmJA9bbABOc5kzsoh+Ct38Gag71AM/y8dA4x/ciyzFh10IkIYPpXcl5yKUq7itZO4LpnWu1fjYAAzMchWjpuub1a+DXjxhUEWjpUUZt0K1yyj9XqSNHFqVoTZUAiFpYSWahSajkpnGUoY9j+kAaMIbzW69aMxVPGjE9WKLUDI+SVyOgw== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SMHn79TeDa0WtsVc7VBHnM7S3UATM57Vu4vAJB3cbH8=; b=gshgfzB9R9ZvmIMivTP+SJWPwL1/ZB6AMyyHGSIBtYAhEDGUO6lJuB3CfPHwbVpFa/gOFOAz8lnd7d5XlvIVYZmHRK4M4Oyd/NWM8bCTtlJz5dbug3tt7w/Hgz71B8Xx5pwRfC+0wwOgmvCJrE3frhG6WRG/lejKH9ZyzPyCxlxJrITrSpyOVfgPbZIGVuqqoSkY8+i6QHy+O/KDdl8Z7pUIkT71cS3TZEf73WXo+8VlzsJofxldQeSrq/WrJCwJ5vpUde1o4/05tBR8zwYjl8AYN3Bd6fWL5vekjAtVhy2p+4mAj9Y6xUFW07KP2FdjJPnlHHUAA0XMYSwb/bg9Hw== arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=comcast.com; dmarc=pass action=none header.from=comcast.com; dkim=pass header.d=comcast.com; arc=none x-ms-exchange-crosstenant-authas: Internal x-ms-exchange-crosstenant-authsource: BN9PR11MB5385.namprd11.prod.outlook.com x-ms-exchange-crosstenant-network-message-id: c1008614-61c7-43c8-3a7e-08d989015f28 x-ms-exchange-crosstenant-originalarrivaltime: 06 Oct 2021 19:42:03.2885 (UTC) x-ms-exchange-crosstenant-fromentityheader: Hosted x-ms-exchange-crosstenant-id: 906aefe9-76a7-4f65-b82d-5ec20775d5aa x-ms-exchange-crosstenant-mailboxtype: HOSTED x-ms-exchange-crosstenant-userprincipalname: chm9Il+2zkcbhP6mNl+kIP750pC17r0aCfqhXh6VZWZb54HmmfQwf9by78TdyohJvE5KGRg2WXVvrSXx67As+5A22rxOizfF31cEoTi/TAo= x-ms-exchange-transport-crosstenantheadersstamped: BN6PR11MB4147 x-originatororg: comcast.com MIME-Version: 1.0 X-CFilter-Loop: Forward AAETWM X-Proofpoint-ORIG-GUID: MtHgxIEy5m7xm2Ka2R6HttS3ANXNfoEi X-Proofpoint-GUID: MtHgxIEy5m7xm2Ka2R6HttS3ANXNfoEi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-10-06_04,2021-10-06_01,2020-04-07_01 X-Proofpoint-Spam-Reason: safe X-Mailman-Approved-At: Wed, 06 Oct 2021 20:47:46 +0000 X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Cc: "Chumak, Serhiy \(Contractor\)" Subject: [ovs-dev] [PATCH] connect: Add min_backoff parameter to the Manager table 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: , From: "Pryima, Anton Serhiyovych \(Contractor\) via dev" Reply-To: "Pryima, Anton Serhiyovych \(Contractor\)" Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" To adjust the minimum number of connection attempts by ovsdb-server to the cloud controller (to avoid ddos when controller was down and then up) Was carefully tested within product's codestack Signed-off-by: Anton Pryima diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index c8ce5362e..f7c5f17c1 100644 --- a/lib/jsonrpc.c +++ b/lib/jsonrpc.c @@ -1306,6 +1306,16 @@ jsonrpc_session_set_max_backoff(struct jsonrpc_session *s, int max_backoff) reconnect_set_backoff(s->reconnect, 0, max_backoff); } +/* Sets 'min_backoff and 'max_backoff' as the minimum and maximum time, + * in milliseconds, to wait after a connection attempt fails before attempting + * to connect again. */ +void +jsonrpc_session_set_backoff(struct jsonrpc_session *s, int min_backoff, + int max_backoff) +{ + reconnect_set_backoff(s->reconnect, min_backoff, max_backoff); +} + /* Sets the "probe interval" for 's' to 'probe_interval', in milliseconds. If * this is zero, it disables the connection keepalive feature. Otherwise, if * 's' is idle for 'probe_interval' milliseconds then 's' will send an echo diff --git a/lib/jsonrpc.h b/lib/jsonrpc.h index 2aa97d3fe..cece97f3b 100644 --- a/lib/jsonrpc.h +++ b/lib/jsonrpc.h @@ -141,6 +141,8 @@ void jsonrpc_session_reset_backoff(struct jsonrpc_session *); void jsonrpc_session_set_max_backoff(struct jsonrpc_session *, int max_backoff); +void jsonrpc_session_set_backoff(struct jsonrpc_session *, + int min_backoff, int max_backoff); void jsonrpc_session_set_probe_interval(struct jsonrpc_session *, int probe_interval); void jsonrpc_session_set_dscp(struct jsonrpc_session *, diff --git a/lib/reconnect.c b/lib/reconnect.c index a929ddfd2..e23763fb8 100644 --- a/lib/reconnect.c +++ b/lib/reconnect.c @@ -551,7 +551,8 @@ reconnect_deadline__(const struct reconnect *fsm) return fsm->state_entered + fsm->backoff; case S_CONNECTING: - return fsm->state_entered + MAX(1000, fsm->backoff); + return fsm->state_entered + MAX(1000, MAX(fsm->min_backoff, + fsm->backoff)); case S_ACTIVE: if (fsm->probe_interval) { diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 351c39d8a..8e283bf0c 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -212,6 +212,7 @@ ovsdb_jsonrpc_default_options(const char *target) { struct ovsdb_jsonrpc_options *options = xzalloc(sizeof *options); options->max_backoff = RECONNECT_DEFAULT_MAX_BACKOFF; + options->min_backoff = RECONNECT_DEFAULT_MIN_BACKOFF; options->probe_interval = (stream_or_pstream_needs_probes(target) ? RECONNECT_DEFAULT_PROBE_INTERVAL : 0); @@ -577,7 +578,8 @@ static void ovsdb_jsonrpc_session_set_options(struct ovsdb_jsonrpc_session *session, const struct ovsdb_jsonrpc_options *options) { - jsonrpc_session_set_max_backoff(session->js, options->max_backoff); + jsonrpc_session_set_backoff(session->js, options->min_backoff, + options->max_backoff); jsonrpc_session_set_probe_interval(session->js, options->probe_interval); jsonrpc_session_set_dscp(session->js, options->dscp); } diff --git a/ovsdb/jsonrpc-server.h b/ovsdb/jsonrpc-server.h index e0653aa39..b157c2860 100644 --- a/ovsdb/jsonrpc-server.h +++ b/ovsdb/jsonrpc-server.h @@ -34,6 +34,7 @@ void ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *); /* Options for a remote. */ struct ovsdb_jsonrpc_options { int max_backoff; /* Maximum reconnection backoff, in msec. */ + int min_backoff; /* Minimum reconnection backoff, in msec. */ int probe_interval; /* Max idle time before probing, in msec. */ bool read_only; /* Only read-only transactions are allowed. */ int dscp; /* Dscp value for manager connections */ diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index b34d97e29..2696643a2 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -948,7 +948,7 @@ add_manager_options(struct shash *remotes, const struct ovsdb_row *row) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); struct ovsdb_jsonrpc_options *options; - long long int max_backoff, probe_interval; + long long int max_backoff, min_backoff, probe_interval; bool read_only; const char *target, *dscp_string, *role; @@ -962,6 +962,9 @@ add_manager_options(struct shash *remotes, const struct ovsdb_row *row) if (ovsdb_util_read_integer_column(row, "max_backoff", &max_backoff)) { options->max_backoff = max_backoff; } + if (ovsdb_util_read_integer_column(row, "min_backoff", &min_backoff)) { + options->min_backoff = min_backoff; + } if (ovsdb_util_read_integer_column(row, "inactivity_probe", &probe_interval)) { options->probe_interval = probe_interval; diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema index 4873cfde7..457925d91 100644 --- a/vswitchd/vswitch.ovsschema +++ b/vswitchd/vswitch.ovsschema @@ -1,6 +1,6 @@ {"name": "Open_vSwitch", - "version": "8.3.0", - "cksum": "3781850481 26690", + "version": "8.4.0", + "cksum": "542313912 26846", "tables": { "Open_vSwitch": { "columns": { @@ -625,6 +625,10 @@ "type": {"key": {"type": "integer", "minInteger": 1000}, "min": 0, "max": 1}}, + "min_backoff": { + "type": {"key": {"type": "integer", + "minInteger": 1000}, + "min": 0, "max": 1}}, "inactivity_probe": { "type": {"key": "integer", "min": 0, "max": 1}}, "connection_mode": { diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 026b5e2ca..4ccfe7f55 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -5668,6 +5668,11 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ Default is implementation-specific. + + Minimum number of milliseconds to wait between connection attempts. + Default is implementation-specific. + + Maximum number of milliseconds of idle time on connection to the client before sending an inactivity probe message. If Open vSwitch does not