From patchwork Mon Oct 19 04:29:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Yamamoto X-Patchwork-Id: 532135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 0C77E1401E7 for ; Mon, 19 Oct 2015 15:31:04 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 7B05B22C38D; Sun, 18 Oct 2015 21:30:18 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id CFC8D22C3B3 for ; Sun, 18 Oct 2015 21:30:17 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id 409A661871C for ; Sun, 18 Oct 2015 22:30:17 -0600 (MDT) X-ASG-Debug-ID: 1445229016-03dc210f8db5c00001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar4.cudamail.com with ESMTP id s5HiFSGTHEZrSctz (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 18 Oct 2015 22:30:16 -0600 (MDT) X-Barracuda-Envelope-From: yamamoto@midokura.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO mail-pa0-f48.google.com) (209.85.220.48) by mx3-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 19 Oct 2015 04:30:10 -0000 Received-SPF: neutral (mx3-pf1.cudamail.com: 209.85.220.48 is neither permitted nor denied by SPF record at spf.mandrillapp.com) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.48 Received: by padhk11 with SMTP id hk11so17065242pad.1 for ; Sun, 18 Oct 2015 21:30:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aFhvYDJaEciDujD9wXVOyLhCu1/e5rcg40BhgG6XFFY=; b=Vddi6hdkCeQr8NhRI0ypTOXa3Ho0kCnSnebaaDNMKkUXu3lSSsuNYxT0TYQiYVzmMN 5f/Jd9RU9s+6/i8/a57gN8U+rGioJNsjIey5Xx2PYclfw4ACKqSujtMqaBweyHdlLcHB +fF38hpnoYfityuTxQzWf3UyzIEXNfks54poil6bduv/lpsCuTwy0HxJS5MVgzaFdEf8 YOWCvOaCjWbk7qiRi2XfdWilZhh3DDztcI8PyOCy7Nbcs4CFVBpMPJbQCB3NjCaXS+8/ P5rB5Be4QwGmUYxhnzgDY+XyWpre4JNFwEXL1QS2fdwWJE5wp7ASKUtYecKFFCe83dBX sDbw== X-Gm-Message-State: ALoCoQlYC6AxdEmBeaGR8/d18AKKluX79jceRPOh6aEQ31IqJQZlS49vnGTVqtOlJpK1eAlynWOb X-Received: by 10.68.57.137 with SMTP id i9mr31884628pbq.101.1445229009894; Sun, 18 Oct 2015 21:30:09 -0700 (PDT) Received: from giraffe.local.net (p2916125-ipngn18101marunouchi.tokyo.ocn.ne.jp. [153.226.221.125]) by smtp.gmail.com with ESMTPSA id we9sm33794799pab.3.2015.10.18.21.30.08 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 21:30:09 -0700 (PDT) X-CudaMail-Envelope-Sender: yamamoto@midokura.com X-Barracuda-Apparent-Source-IP: 153.226.221.125 From: YAMAMOTO Takashi To: dev@openvswitch.org X-CudaMail-MID: CM-V1-1017022461 X-CudaMail-DTE: 101815 X-CudaMail-Originating-IP: 209.85.220.48 Date: Mon, 19 Oct 2015 13:29:10 +0900 X-ASG-Orig-Subj: [##CM-V1-1017022461##][PATCH 19/21] ofproto.at: Workaround a race Message-Id: <1445228952-22445-19-git-send-email-yamamoto@midokura.com> X-Mailer: git-send-email 2.3.8 (Apple Git-58) In-Reply-To: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> References: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> X-GBUdb-Analysis: 0, 209.85.220.48, Ugly c=0.369283 p=-0.5 Source Normal X-MessageSniffer-Rules: 0-0-0-3864-c X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1445229016 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-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23618 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: YAMAMOTO Takashi Subject: [ovs-dev] [PATCH 19/21] ofproto.at: Workaround a race X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" While a barrier serializes requests from the same connection, it doesn't wait for requests from other connections to the switch. Replace the barrier with infamous "sleep 1" to workaround the problem. Signed-off-by: YAMAMOTO Takashi Acked-by: Ben Pfaff --- tests/ofproto.at | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/ofproto.at b/tests/ofproto.at index e1cb430..c947582 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -2430,8 +2430,7 @@ udp,vlan_tci=0x0000,dl_src=00:26:b9:8c:b0:f9,dl_dst=00:25:83:df:b4:00,nw_src=172 fi AT_FAIL_IF([test X"$1" != X]) - ovs-appctl -t ovs-ofctl ofctl/barrier - echo >>expout "OFPT_BARRIER_REPLY (OF1.2):" + sleep 1 AT_CHECK( [[sed '