From patchwork Thu Nov 24 22:53:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1708854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LfMVxMVr; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NJCw84ylBz23nd for ; Fri, 25 Nov 2022 09:53:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1D9C040423; Thu, 24 Nov 2022 22:53:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1D9C040423 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LfMVxMVr X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id poxN85GswaQz; Thu, 24 Nov 2022 22:53:38 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id BEAC940159; Thu, 24 Nov 2022 22:53:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BEAC940159 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 79E73C0033; Thu, 24 Nov 2022 22:53:37 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 46D64C002D for ; Thu, 24 Nov 2022 22:53:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1190381367 for ; Thu, 24 Nov 2022 22:53:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1190381367 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LfMVxMVr 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 P8fpbeIdWnNP for ; Thu, 24 Nov 2022 22:53:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E3BBF81020 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id E3BBF81020 for ; Thu, 24 Nov 2022 22:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669330411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/HvMQKRb42njtUK1QuJ2blA4addbE9uNktvN/SsQfj4=; b=LfMVxMVrNfH1EyZN3GCNVQIL5DZZwiNKUgIK7egkVNlHkDnNWKi8Gg59ua61kGISQz6XsT 8HwtcrarQk9f30QuhL3q4tEvaNUx9WtHFoRUP/9hvgN7Rzi7ubaVT40y98Se5q6L2nTjJV Y7t61HcJBfYSJRjd1Yn/4Xve80K9Q48= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-219-sjNVDKEfO72Z7N-Uky8N0A-1; Thu, 24 Nov 2022 17:53:30 -0500 X-MC-Unique: sjNVDKEfO72Z7N-Uky8N0A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F013C85A59D for ; Thu, 24 Nov 2022 22:53:29 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.ntdv.lab.eng.bos.redhat.com [10.19.188.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3CA3111E3EB; Thu, 24 Nov 2022 22:53:29 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 24 Nov 2022 17:53:29 -0500 Message-Id: <20221124225329.1640090-1-xsimonar@redhat.com> In-Reply-To: <20221124140430.1026243-1-xsimonar@redhat.com> References: <20221124140430.1026243-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2] tests: change recompute test case (reduce time) 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: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Recompute test case was checking whether there were no recomputes when ports were ready to be claimed by ovn-controller but sb was read-only. However this was tested by running a test case reproducing how the issue was initially identified: running many ports (1000!) on a few hypervisors, which ** usually ** produced the expected race condition. The new test case now simply makes sb to sleep, causing the read-only condition to always happen. This dramatically reduces the duration of the test. Signed-off-by: Xavier Simonart Acked-by: Ales Musil --- v2: - Fixed test when conditional monitoring is enabled - Fixed the fact that, if OVS_WAIT_UNTIL failed (timeout) for whatever reason while sb was stopped/paused, the test was stuck forever. --- tests/ovn.at | 115 ++++++++++++--------------------------------------- 1 file changed, 26 insertions(+), 89 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index fc74aa29a..6afc2f43c 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -32779,116 +32779,53 @@ OVN_FOR_EACH_NORTHD([ AT_SETUP([recomputes]) ovn_start -n_hv=4 - -# Add chassis net_add n1 -for i in $(seq 1 $n_hv); do - sim_add hv$i - as hv$i - check ovs-vsctl add-br br-phys - ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys - ovn_attach n1 br-phys 192.168.0.$i 24 geneve -done - -check ovn-sbctl set connection . inactivity_probe=0 - -add_switch_ports() { - start_port=$1 - end_port=$2 - nb_hv=$3 - bulk_size=$4 - for ((i=start_port; i