From patchwork Thu Nov 24 14:04:30 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xavier Simonart <xsimonar@redhat.com>
X-Patchwork-Id: 1708751
Return-Path: <ovs-dev-bounces@openvswitch.org>
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::137; helo=smtp4.osuosl.org;
 envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>)
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=fYPJXWbC;
	dkim-atps=neutral
Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])
	(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 4NJ09j4xMVz23mg
	for <incoming@patchwork.ozlabs.org>; Fri, 25 Nov 2022 01:04:41 +1100 (AEDT)
Received: from localhost (localhost [127.0.0.1])
	by smtp4.osuosl.org (Postfix) with ESMTP id 7EBD641BD7;
	Thu, 24 Nov 2022 14:04:39 +0000 (UTC)
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7EBD641BD7
Authentication-Results: smtp4.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=fYPJXWbC
X-Virus-Scanned: amavisd-new at osuosl.org
Received: from smtp4.osuosl.org ([127.0.0.1])
	by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id tLR4LDUCT2Rp; Thu, 24 Nov 2022 14:04:38 +0000 (UTC)
Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])
	by smtp4.osuosl.org (Postfix) with ESMTPS id 3135E4089F;
	Thu, 24 Nov 2022 14:04:37 +0000 (UTC)
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3135E4089F
Received: from lf-lists.osuosl.org (localhost [127.0.0.1])
	by lists.linuxfoundation.org (Postfix) with ESMTP id 0A40EC0033;
	Thu, 24 Nov 2022 14:04:37 +0000 (UTC)
X-Original-To: dev@openvswitch.org
Delivered-To: ovs-dev@lists.linuxfoundation.org
Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])
 by lists.linuxfoundation.org (Postfix) with ESMTP id EC2C8C002D
 for <dev@openvswitch.org>; Thu, 24 Nov 2022 14:04:35 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
 by smtp1.osuosl.org (Postfix) with ESMTP id C781F81E34
 for <dev@openvswitch.org>; Thu, 24 Nov 2022 14:04:35 +0000 (UTC)
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C781F81E34
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=fYPJXWbC
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 SPMnRACC19cO for <dev@openvswitch.org>;
 Thu, 24 Nov 2022 14:04:35 +0000 (UTC)
X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D9DD581E16
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 D9DD581E16
 for <dev@openvswitch.org>; Thu, 24 Nov 2022 14:04:34 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
 s=mimecast20190719; t=1669298673;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding;
 bh=qlwgeuSrOqzu4kWKrNKFTSV4dnmk734Si9XyDrks/uw=;
 b=fYPJXWbCEMYJz0i/8ipF1t+u6+hbpC+s4vcQ7CqljOfOlt4V5//mvgWDD/45XKhi9sC7cJ
 zhnevnxQxRZzZAMVuqTeRqVRFqNOcaPEE8opPe4n0oR1wWoE6MiZCAydhgWs30MW+pPaOb
 Ei8V/6z16j7kWjjNB5lcuDRkFShDEoI=
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-631-mEDf6gG2Pqq8GXPvj8spzQ-1; Thu, 24 Nov 2022 09:04:30 -0500
X-MC-Unique: mEDf6gG2Pqq8GXPvj8spzQ-1
Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com
 [10.11.54.10])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57BEE1C075AA
 for <dev@openvswitch.org>; Thu, 24 Nov 2022 14:04:30 +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 3BE08492B04;
 Thu, 24 Nov 2022 14:04:30 +0000 (UTC)
From: Xavier Simonart <xsimonar@redhat.com>
To: xsimonar@redhat.com,
	dev@openvswitch.org
Date: Thu, 24 Nov 2022 09:04:30 -0500
Message-Id: <20221124140430.1026243-1-xsimonar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Cc: dceara@redhat.com
Subject: [ovs-dev] [PATCH ovn] tests: change recompute test case (reduce
	time)
X-BeenThere: ovs-dev@openvswitch.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: <ovs-dev.openvswitch.org>
List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>,
 <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>
List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/>
List-Post: <mailto:ovs-dev@openvswitch.org>
List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help>
List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,
 <mailto:ovs-dev-request@openvswitch.org?subject=subscribe>
Errors-To: ovs-dev-bounces@openvswitch.org
Sender: "dev" <ovs-dev-bounces@openvswitch.org>

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 <xsimonar@redhat.com>
Acked-by: Ales Musil <amusil@redhat.com>
---
 tests/ovn.at | 115 +++++++++++----------------------------------------
 1 file changed, 25 insertions(+), 90 deletions(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index fc74aa29a..ce9cf7a1c 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -32779,116 +32779,51 @@ 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<end_port; )) do
-        start_bulk=$i
-        for hv in $(seq 1 $nb_hv); do
-            end_bulk=$((start_bulk+bulk_size-1))
-            for port in $(seq $start_bulk $end_bulk); do
-                logical_switch_port=lsp${port}
-                OVN_NBCTL(lsp-add ls1 $logical_switch_port)
-                OVN_NBCTL(lsp-set-addresses $logical_switch_port dynamic)
-            done
-            start_bulk=$((end_bulk+1))
-        done
-        RUN_OVN_NBCTL()
+sim_add hv1
+as hv1
+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.1 24 geneve
 
-        start_bulk=$i
-        for hv in $(seq 1 $nb_hv); do
-            end_bulk=$((start_bulk+bulk_size-1))
-            for port in $(seq $start_bulk $end_bulk); do
-                logical_switch_port=lsp${port}
-                as hv$hv ovs-vsctl \
-                    --no-wait -- add-port br-int vif${port} \
-                    -- set Interface vif${port} external_ids:iface-id=$logical_switch_port
-            done
-            start_bulk=$((end_bulk+1))
-        done
-        i=$((end_bulk+1))
-    done
-}
 check ovn-nbctl ls-add ls1
 check ovn-nbctl set Logical_Switch ls1 other_config:subnet=10.1.0.0/16
 check ovn-nbctl set Logical_Switch ls1 other_config:exclude_ips=10.1.255.254
 
-check ovn-nbctl lr-add lr1
-check ovn-nbctl lsp-add ls1 lsp0 -- set Logical_Switch_Port lsp0 type=router options:router-port=lrp0 addresses=dynamic
-check ovn-nbctl lrp-add lr1 lrp0 "f0:00:00:01:00:01" 10.1.255.254/16
-check ovn-nbctl lr-nat-add lr1 snat 10.2.0.1 10.1.0.0/16
-
-lflow_run=0
 check ovn-nbctl --wait=hv sync
 
-# Tunnel ports might not be added (yet) at this point on slow system.
-# Wait for flows related to such ports to ensure those ports have been added
-# before we measure recomputes. Otherwise, ovs_interface handler might be run
-# afterwards for tunnel ports, causing recomputes.
-for i in $(seq 1 $n_hv); do
-    for j in $(seq 1 $n_hv); do
-        if test $i != $j; then
-            OVN_WAIT_REMOTE_INPUT_FLOWS(["hv$i"],["hv$j"])
-        fi
-    done
-done
+as hv1
+lflow_run=$(ovn-appctl -t ovn-controller coverage/read-counter lflow_run)
 
-for i in $(seq 1 $n_hv); do
-    as hv$i
-    lflow_run1=$(ovn-appctl -t ovn-controller coverage/read-counter lflow_run)
-    lflow_run=`expr $lflow_run1 + $lflow_run`
-done
+check ovn-nbctl lsp-add ls1 lsp1
+check ovn-nbctl lsp-add ls1 lsp2
+check ovn-nbctl --wait=hv sync
+
+# Make sb sleep
+AT_CHECK([kill -STOP $(cat ovn-sb/ovsdb-server.pid)])
 
-add_switch_ports 1 1000 $n_hv 5
+as hv1
+ovs-vsctl --no-wait -- add-port br-int vif1 \
+                    -- set Interface vif1 external_ids:iface-id=lsp1
+ovs-vsctl --no-wait -- add-port br-int vif2 \
+                    -- set Interface vif2 external_ids:iface-id=lsp2
+
+# Check that ovn-controller handled the binding by checking that some flows
+# are installed
+OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int | grep output | wc -l` -eq 2])
+AT_CHECK([kill -CONT $(cat ovn-sb/ovsdb-server.pid)])
 
 wait_for_ports_up
 check ovn-nbctl --wait=hv sync
 
-for i in $(seq 1 $n_hv); do
-    pid=$(cat hv${i}/ovn-controller.pid)
-    u=$((u+$(cat "/proc/$pid/stat" | awk '{print $14}')))
-    s=$((s+$(cat "/proc/$pid/stat" | awk '{print $15}')))
-done
-
-n_pid=$(cat northd/ovn-northd.pid)
-n_u=$(cat "/proc/$pid/stat" | awk '{print $14}')
-n_s=$(cat "/proc/$pid/stat" | awk '{print $15}')
-
-echo "Total Northd User Time: $n_u"
-echo "Total Northd System Time: $n_s"
-echo "Total Controller User Time: $u"
-echo "Total Controller System Time: $s"
+as hv1
+lflow_run_end=$(ovn-appctl -t ovn-controller coverage/read-counter lflow_run)
 
-lflow_run_end=0
-for i in $(seq 1 $n_hv); do
-    as hv$i
-    lflow_run1=$(ovn-appctl -t ovn-controller coverage/read-counter lflow_run)
-    lflow_run_end=`expr $lflow_run1 + $lflow_run_end`
-done
 n_recomputes=`expr $lflow_run_end - $lflow_run`
 echo "$n_recomputes recomputes"
 
 AT_CHECK([test $lflow_run_end == $lflow_run])
 
-for i in $(seq 2 $n_hv); do
-    OVN_CLEANUP_SBOX([hv$i])
-done
 OVN_CLEANUP([hv1])
 AT_CLEANUP
 ])