| Message ID | 201603082223.u28MNJFe025525@d03av01.boulder.ibm.com |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <dev-bounces@openvswitch.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 719CA140328 for <incoming@patchwork.ozlabs.org>; Wed, 9 Mar 2016 09:23:30 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id D595B10313; Tue, 8 Mar 2016 14:23:28 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 8E842102F3 for <dev@openvswitch.org>; Tue, 8 Mar 2016 14:23:27 -0800 (PST) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id EE5FD1612BE for <dev@openvswitch.org>; Tue, 8 Mar 2016 15:23:25 -0700 (MST) X-ASG-Debug-ID: 1457475805-0b32377bd51fba0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar6.cudamail.com with ESMTP id xb8TBLjjOCVANzNt (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for <dev@openvswitch.org>; Tue, 08 Mar 2016 15:23:25 -0700 (MST) X-Barracuda-Envelope-From: ramu.ramamurthy@us.ibm.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO e32.co.us.ibm.com) (32.97.110.150) by mx1-pf1.cudamail.com with ESMTPS (AES256-SHA encrypted); 8 Mar 2016 22:23:24 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at us.ibm.com designates 32.97.110.150 as permitted sender) X-Barracuda-Apparent-Source-IP: 32.97.110.150 X-Barracuda-RBL-IP: 32.97.110.150 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <dev@openvswitch.org> from <ramu.ramamurthy@us.ibm.com>; Tue, 8 Mar 2016 15:23:23 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Mar 2016 15:23:21 -0700 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: ramu.ramamurthy@us.ibm.com X-IBM-RcptTo: dev@openvswitch.org Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id B29F119D8047 for <dev@openvswitch.org>; Tue, 8 Mar 2016 15:11:16 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u28MNLii37486632 for <dev@openvswitch.org>; Tue, 8 Mar 2016 15:23:21 -0700 Received: from d03av01.boulder.ibm.com (localhost [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u28MNKV9025618 for <dev@openvswitch.org>; Tue, 8 Mar 2016 15:23:20 -0700 Received: from e39.co.us.ibm.com (e39.boulder.ibm.com [9.17.249.49]) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u28MNJFe025525 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <dev@openvswitch.org>; Tue, 8 Mar 2016 15:23:20 -0700 Message-Id: <201603082223.u28MNJFe025525@d03av01.boulder.ibm.com> Received: from localhost by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <dev@openvswitch.org> from <ramu.ramamurthy@us.ibm.com>; Tue, 8 Mar 2016 15:23:19 -0700 Received: from smtp.notes.na.collabserv.com (192.155.248.91) by e39.co.us.ibm.com (192.168.2.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256/256) Tue, 8 Mar 2016 15:23:18 -0700 X-IBM-Helo: smtp.notes.na.collabserv.com X-IBM-MailFrom: ramu.ramamurthy@us.ibm.com X-IBM-RcptTo: dev@openvswitch.org Received: from /spool/local by smtp.notes.na.collabserv.com with smtp.notes.na.collabserv.com ESMTP for <dev@openvswitch.org> from <ramu.ramamurthy@us.ibm.com>; Tue, 8 Mar 2016 22:23:17 -0000 Received: from us1a3-smtp01.a3.dal06.isc4sb.com (10.106.154.95) by smtp.notes.na.collabserv.com (10.106.227.143) with smtp.notes.na.collabserv.com ESMTP; Tue, 8 Mar 2016 22:23:15 -0000 Received: from us1a3-mail99.a3.dal06.isc4sb.com ([10.146.21.188]) by us1a3-smtp01.a3.dal06.isc4sb.com with ESMTP id 2016030822231453-490036 ; Tue, 8 Mar 2016 22:23:14 +0000 In-Reply-To: <1457392078-25665-1-git-send-email-blp@ovn.org> To: Ben Pfaff <blp@ovn.org> X-CudaMail-MID: CM-E1-307088763 X-CudaMail-DTE: 030816 X-CudaMail-Originating-IP: 32.97.110.150 X-CudaMail-Envelope-Sender: ramu.ramamurthy@us.ibm.com X-ASG-Orig-Subj: [##CM-E1-307088763##]Re: [ovs-dev] [PATCH] Revert "ovn-controller: race between binding-run and patch-run for localnet ports" From: "Suryanarayan Ramamurthy" <ramu.ramamurthy@us.ibm.com> Date: Tue, 8 Mar 2016 14:23:08 -0800 References: <1457392078-25665-1-git-send-email-blp@ovn.org> MIME-Version: 1.0 X-KeepSent: EC561A38:49545B8D-00257F70:007A63ED; type=4; name=$KeepSent X-Mailer: IBM Notes Release 9.0.1SHF211 December 19, 2013 X-LLNOutbound: False X-Disclaimed: 51731 X-TNEFEvaluated: 1 x-cbid: 16030822-0005-0000-0000-00001D448000 X-IBM-ISS-SpamDetectors: Score=0.4332; BY=0.149201; FL=0; FP=0; FZ=0; HX=0; KW=0; PH=0; SC=0.4332; ST=0; TS=0; UL=0; ISC= X-IBM-ISS-DetailInfo: BY=3.00005012; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000150; SDB=6.00670557; UDB=6.00306347; UTC=2016-03-08 22:23:16 x-cbparentid: 16030822-4778-0000-0000-00000257688B X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER X-GBUdb-Analysis: 0, 32.97.110.150, Ugly c=0 p=0 Source New X-MessageSniffer-Rules: 0-0-0-27724-c X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1457475805 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) X-Content-Filtered-By: Mailman/MimeDel 2.1.16 Cc: dev@openvswitch.org, Ramu Ramamurthy <ramu.ramamurthy@gmail.com> Subject: Re: [ovs-dev] [PATCH] Revert "ovn-controller: race between binding-run and patch-run for localnet ports" X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: <dev.openvswitch.org> List-Unsubscribe: <http://openvswitch.org/mailman/options/dev>, <mailto:dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://openvswitch.org/pipermail/dev> List-Post: <mailto:dev@openvswitch.org> List-Help: <mailto:dev-request@openvswitch.org?subject=help> List-Subscribe: <http://openvswitch.org/mailman/listinfo/dev>, <mailto:dev-request@openvswitch.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dev-bounces@openvswitch.org Sender: "dev" <dev-bounces@openvswitch.org> |
diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c index cfae613..753ce3e 100644 --- a/ovn/controller/patch.c +++ b/ovn/controller/patch.c @@ -280,7 +280,7 @@ void patch_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int, struct hmap *local_datapaths) { - if (!ctx->ovs_idl_txn || !ctx->ovnsb_idl_txn) { + if (!ctx->ovs_idl_txn) { return; }
Ben, I still see a problem in my tests on master with localnet ports getting deleted unnecessarily - Here is a log of a run.. I added some logs to try to narrow down the problem. 2016-03-08T22:10:30.768Z|00001|vlog|INFO|opened log file /home/ovs/ovs/tests/testsuite.dir/2025/hv/ovn-controller.log 2016-03-08T22:10:30.769Z|00002|reconnect|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/db.sock: connecting... 2016-03-08T22:10:30.770Z|00003|reconnect|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/db.sock: connected 2016-03-08T22:10:30.775Z|00004|reconnect|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/ovn-sb/ovn-sb.sock: connecting... 2016-03-08T22:10:30.775Z|00005|reconnect|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/ovn-sb/ovn-sb.sock: connected 2016-03-08T22:10:30.777Z|00006|binding|INFO|in binding_run 2016-03-08T22:10:30.777Z|00007|binding|INFO|adding datapath 201 2016-03-08T22:10:30.777Z|00008|binding|INFO|Claiming lport localvif201 for this chassis. 2016-03-08T22:10:30.777Z|00009|binding|INFO|adding datapath 103 2016-03-08T22:10:30.777Z|00010|binding|INFO|Claiming lport localcif4 for this chassis. 2016-03-08T22:10:30.777Z|00011|binding|INFO|Claiming lport localcif5 for this chassis. 2016-03-08T22:10:30.777Z|00012|binding|INFO|Claiming lport localcif3 for this chassis. 2016-03-08T22:10:30.777Z|00013|binding|INFO|Claiming lport localcif1 for this chassis. 2016-03-08T22:10:30.777Z|00014|binding|INFO|Claiming lport localcif2 for this chassis. 2016-03-08T22:10:30.777Z|00015|binding|INFO|Claiming lport localvif3 for this chassis. 2016-03-08T22:10:30.777Z|00016|binding|INFO|adding datapath 102 2016-03-08T22:10:30.777Z|00017|binding|INFO|Claiming lport localvif2 for this chassis. 2016-03-08T22:10:30.778Z|00018|binding|INFO|adding datapath 101 2016-03-08T22:10:30.778Z|00019|binding|INFO|Claiming lport localvif1 for this chassis. 2016-03-08T22:10:30.778Z|00020|ofctrl|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/br-int.mgmt: connecting to switch 2016-03-08T22:10:30.779Z|00021|rconn|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/br-int.mgmt: connecting... 2016-03-08T22:10:30.779Z|00022|pinctrl|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/br-int.mgmt: connecting to switch 2016-03-08T22:10:30.779Z|00023|rconn|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/br-int.mgmt: connecting... 2016-03-08T22:10:30.780Z|00024|binding|INFO|in binding_run 2016-03-08T22:10:30.780Z|00025|binding|INFO|no chassis rec 2016-03-08T22:10:30.780Z|00026|binding|INFO|null ovnsb This is exiting here in binding_run() - I added the logs: chassis_rec = get_chassis(ctx->ovnsb_idl, chassis_id); if (!chassis_rec) { VLOG_INFO("no chassis rec"); if (!ctx->ovnsb_idl_txn) { VLOG_INFO("null ovnsb"); } return; } 2016-03-08T22:10:30.781Z|00027|patch|INFO|did not find datapath for localnet201 2016-03-08T22:10:30.782Z|00028|patch|INFO|did not find datapath for localnet1 2016-03-08T22:10:30.783Z|00029|patch|INFO|remove port patch-br-int-to-localnet201 2016-03-08T22:10:30.783Z|00030|patch|INFO|remove port patch-br-int-to-localnet1 2016-03-08T22:10:30.783Z|00031|patch|INFO|remove port patch-localnet201-to-br-int 2016-03-08T22:10:30.783Z|00032|patch|INFO|remove port patch-localnet1-to-br-int 2016-03-08T22:10:30.784Z|00033|rconn|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/br-int.mgmt: connected 2016-03-08T22:10:30.784Z|00034|rconn|INFO|unix:/home/ovs/ovs/tests/testsuite.dir/2025/hv/br-int.mgmt: connected From: Ben Pfaff <blp@ovn.org> To: dev@openvswitch.org Cc: Ben Pfaff <blp@ovn.org>, Ramu Ramamurthy <ramu.ramamurthy@gmail.com> Date: 03/07/2016 03:08 PM Subject: [ovs-dev] [PATCH] Revert "ovn-controller: race between binding-run and patch-run for localnet ports" Sent by: "dev" <dev-bounces@openvswitch.org> This reverts commit 3a83007a76bbf05144cee1fda7ad81c1c717dca7. It's really nonobvious from the code why the condition added by that commit makes sense. The new condition should not be necessary now that binding_run() always keeps track of the local datapaths, since commit 7c040135cf351 (binding: Track local datapaths even when no transaction is possible). CC: Ramu Ramamurthy <ramu.ramamurthy@gmail.com> Signed-off-by: Ben Pfaff <blp@ovn.org> --- ovn/controller/patch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)