From patchwork Thu Jan 31 23:10:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1034515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q5KMaAQh"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43rGDr2dQJz9s4Z for ; Fri, 1 Feb 2019 10:10:52 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6F4574EEC; Thu, 31 Jan 2019 23:10:32 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 8CA3E4ED0 for ; Thu, 31 Jan 2019 23:10:11 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1E4E8865 for ; Thu, 31 Jan 2019 23:10:11 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id r136so2183402pfc.6 for ; Thu, 31 Jan 2019 15:10:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L7+5wWOwQMKiqKrbN0ZSsZ7zfE++g3wfvx2TFG0cFYQ=; b=q5KMaAQhkBO0N3KtfEqMkA0M9LZUHknQFcc0/Tnlq9LJ6QBjhYRQBHUJg1eiirVrND Omu16+43uLilcf4Z+k+Sa/ND/hbJIBrkPa1WIHHEfWnnyKeqtNJ9lyFx3Xii2WDFBj0r IIvuBkEjNpUsjKqnSTLZ85Por0IxUJArrri/aGo7C2YyfVDJxNiXj42TbEi54LxOjwjw oG0Cx9JVuCKavNrfBc8m37lMMUM2aEPnTsZ030BUsMUqn2g6fbeyc6IrUc6QW7sZ+Ljf VV1Yeo15jkqJ9JZF92gY12wchiHT7uDvRYOrROZaAyg6Nr0k59GRABHrzdFDefxatp0o zOaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L7+5wWOwQMKiqKrbN0ZSsZ7zfE++g3wfvx2TFG0cFYQ=; b=mDk/P9C3CSMP0KJAqirMM9c9R3/xqvz2gOFajbm1gc8I/BR1pZMHyw9uA7ykZuDYmh vFGFk1U9C+HcxST5Fb30bgx8bRWnrKBO4XcTRuDmX1sdDpIUsH3jvWT/3j/Y8ShCeFtI BKx1ZOd26kgTwJU+gzo3uL/BHLyQGvkhmUM6EOM6YPFmnS75tgqKWSeKzv7Ry6PPcrfX SWas9QtLmx9YNxpNYaIcnzddX/5RxtOKdv4mkh1CUmHuiHoq42bzG+HRTKocvYUWX1h3 YiMFo39c0Pg7f8Ggw34B3pruSrDVY2qLEIMy1N+a5HKR1DKEf/hneV+W0T8iuvgY/Fda k4pg== X-Gm-Message-State: AJcUukdw2VW49WlB2UJ6xUtLrUb6hLHXFDdzq77Je+hk0PRwAwCSflBQ c99qpWqKh4d6/sR/9M8bvPue+6uH X-Google-Smtp-Source: ALg8bN4fESCM3AiiFKHoR1hkeaZjC5grYRdjlo7PUISTDclqFbuyp7KdnfJKRucDd+ijZntC/7JTuA== X-Received: by 2002:a62:22d4:: with SMTP id p81mr37773886pfj.16.1548976210492; Thu, 31 Jan 2019 15:10:10 -0800 (PST) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id f13sm6683368pgq.82.2019.01.31.15.10.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jan 2019 15:10:09 -0800 (PST) From: Yifeng Sun To: dev@openvswitch.org Date: Thu, 31 Jan 2019 15:10:01 -0800 Message-Id: <1548976201-25288-2-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548976201-25288-1-git-send-email-pkusunyifeng@gmail.com> References: <1548976201-25288-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 2/2] test: Fix failed test "flow resume with geneve tun_metadata" X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Test "flow resume with geneve tun_metadata" failed because there is no controller running to send controller(pause) message. A previous commit deleted the line that starts ovs-ofctl as a controller in order to avoid a race condition on monitor log. This patch adds back this line but omits the log file because this test doesn't dpends on the log file. Fixes: e8833217914f9c071c49 ("system-traffic.at: avoid a race condition on monitor log") CC: David Marchand Signed-off-by: Yifeng Sun --- tests/system-traffic.at | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index ffe508dd61f7..84c2af4170a3 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -538,6 +538,8 @@ OVS_CHECK_GENEVE() OVS_TRAFFIC_VSWITCHD_START() ADD_BR([br-underlay]) +AT_CHECK([ovs-ofctl monitor br0 resume --detach --no-chdir --pidfile 2> /dev/null]) + ADD_NAMESPACES(at_ns0) dnl Set up underlay link from host into the namespace using veth pair. @@ -567,6 +569,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 10.1.1.100 | FORMAT_PING], [0], [dnl 3 packets transmitted, 3 received, 0% packet loss, time 0ms ]) +OVS_APP_EXIT_AND_WAIT([ovs-ofctl]) OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP