From patchwork Tue Jul 18 14:55:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Angel Ajo X-Patchwork-Id: 790338 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=) 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 3xBjtH3kysz9t2Q for ; Wed, 19 Jul 2017 00:56:55 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B8AA18D7; Tue, 18 Jul 2017 14:55:15 +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 F315D8D7 for ; Tue, 18 Jul 2017 14:55:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1785D1CE for ; Tue, 18 Jul 2017 14:55:13 +0000 (UTC) Received: by mail-wr0-f176.google.com with SMTP id w4so32160823wrb.2 for ; Tue, 18 Jul 2017 07:55:13 -0700 (PDT) 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=4aeU5XvXDjyzAWsrAYB4DRrkLO9T0eFCJ717WqN8u4o=; b=nxcyaKw+3Bfpmkyp5k9BJckUiSPFur9T3MWDG9a6m3DeDcGwZ63PzQIxnS7KRbPbMc Bkhk5nehU1Q0tG6Kc3w+2jGL0kXQ+h4K5tCOnSs+3rpgxwPKH9jnM9ewLlxnlNsNI7NJ AVvZSXjZtcycYHUpFsskkDJxRvtjdvG3GX4xAjlD9KtwH3MiPQWnDMLHZ113KAy5rHgW 2JeO3aDPZ9qYpWvSj1+k206f04zbi743WSEl/4CCUup67xuBZVJnbRcpSV72BFQhtArs u5bFRwwd3TBWWHE+bHfVSEwBGbOmQ03qe/O2C9mtYdZ1FOfhS9dLCwsUgCgg0pMWZP0Y CsMg== X-Gm-Message-State: AIVw1110UATjcR8z3UfBTBnct7GCsq3g0PQY2sslF+b+OqsHc50gsDCX L+ZXrO4sue3X5mFRqoiqVA== X-Received: by 10.28.17.78 with SMTP id 75mr2504164wmr.63.1500389712406; Tue, 18 Jul 2017 07:55:12 -0700 (PDT) Received: from gw2.localdomain (111.148.134.37.dynamic.jazztel.es. [37.134.148.111]) by smtp.gmail.com with ESMTPSA id m26sm3535501wrm.4.2017.07.18.07.55.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 07:55:11 -0700 (PDT) From: Miguel Angel Ajo To: dev@openvswitch.org Date: Tue, 18 Jul 2017 14:55:01 +0000 Message-Id: <1500389703-5928-2-git-send-email-majopela@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500389703-5928-1-git-send-email-majopela@redhat.com> References: <1500389703-5928-1-git-send-email-majopela@redhat.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, 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 Cc: Miguel Angel Ajo Subject: [ovs-dev] [PATCH v1 2/4] ovn: l3ha, add timeout to each sync operation during tests 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 This makes tests easier to debug because the sync operation won't hang up when an ovn-controller or ovn-northd is not responding for any reason. Signed-off-by: Miguel Angel Ajo --- tests/ovn.at | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 03a9ff4..d8b8693 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -6981,7 +6981,7 @@ test_ip_packet() test_ip_packet gw1 gw2 -ovn-nbctl --wait=hv \ +ovn-nbctl --timeout=3 --wait=hv \ --id=@gc0 create Gateway_Chassis name=alice_gw1 \ chassis_name=gw1 \ priority=10 -- \ @@ -7333,7 +7333,7 @@ OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [hv2-vif1.expected]) AT_CHECK([ovn-sbctl --bare --columns _uuid find Port_Binding logical_port=cr-alice | wc --lines], [0], [1 ]) -ovn-nbctl --wait=sb remove Logical_Router_Port alice options redirect-chassis +ovn-nbctl --timeout=3 --wait=sb remove Logical_Router_Port alice options redirect-chassis AT_CHECK([ovn-sbctl find Port_Binding logical_port=cr-alice | wc --lines], [0], [0 ]) @@ -7761,7 +7761,7 @@ ovn-nbctl lsp-set-options ln-outside network_name=phys # Allow some time for ovn-northd and ovn-controller to catch up. # XXX This should be more systematic. -ovn-nbctl --wait=hv sync +ovn-nbctl --wait=hv --timeout=3 sync echo "---------NB dump-----" ovn-nbctl show @@ -7869,7 +7869,7 @@ ovn-nbctl --id=@gc0 create Gateway_Chassis \ # XXX: Let the change propagate down to the ovn-controllers -ovn-nbctl --wait=hv sync +ovn-nbctl --wait=hv --timeout=3 sync # we make sure that the hypervisors noticed, and inverted the slave ports AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=32 | grep active_backup | grep slaves:$hv1_gw2_ofport,$hv1_gw1_ofport | wc -l], [0], [1 @@ -8144,7 +8144,7 @@ ovn-nbctl lsp-set-type ln-outside localnet ovn-nbctl lsp-set-options ln-outside network_name=phys # Allow some time for ovn-northd and ovn-controller to catch up. -ovn-nbctl --wait=hv sync +ovn-nbctl --wait=hv --timeout=3 sync # currently when ovn-controller is restarted, the old entry is deleted # and a new one is created, which leaves the Gateway_Chassis with