From patchwork Thu Jul 18 19:40:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 1962206 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::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQ37l1KVxz1ySl for ; Fri, 19 Jul 2024 05:40:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 62FE080E13; Thu, 18 Jul 2024 19:40:47 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qgX2qFGmB-9n; Thu, 18 Jul 2024 19:40:46 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6BB0480DC6 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6BB0480DC6; Thu, 18 Jul 2024 19:40:46 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3D68CC0A97; Thu, 18 Jul 2024 19:40:46 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id D2540C0A96 for ; Thu, 18 Jul 2024 19:40:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id ABBDA40313 for ; Thu, 18 Jul 2024 19:40:44 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id BI4ye20ttxLx for ; Thu, 18 Jul 2024 19:40:44 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.193; helo=relay1-d.mail.gandi.net; envelope-from=i.maximets@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 8B812402ED Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8B812402ED Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8B812402ED for ; Thu, 18 Jul 2024 19:40:42 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id CD97E240003; Thu, 18 Jul 2024 19:40:39 +0000 (UTC) From: Ilya Maximets To: ovs-dev@openvswitch.org Date: Thu, 18 Jul 2024 21:40:35 +0200 Message-ID: <20240718194037.3196243-1-i.maximets@ovn.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn] ovn-northd.at: Fix flaky VXLAN mode disabling test. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilya Maximets Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This tests constructs a very large operation that frequently takes more than a second on busy CI systems. As a result ovn-nbctl emits a warning for a long poll interval and fails the test. Fix that by splitting a single large command into a series of smaller ones - 100 switches at a time. This makes the test a bit slower, but much more reliable. Fixes: 7e99500e60bf ("northd: Add support for disabling vxlan mode.") Signed-off-by: Ilya Maximets --- tests/ovn-northd.at | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index a389d1988..d7551f69a 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -2882,12 +2882,16 @@ ovn-sbctl \ --id=@e create encap chassis_name=hv1 ip="192.168.0.1" type="vxlan" \ -- --id=@c create chassis name=hv1 encaps=@e -cmd="ovn-nbctl --wait=sb" +cmd="" for i in {1..4097..1}; do cmd="${cmd} -- ls-add lsw-${i}" + if test $(($i % 100)) -eq 0; then + check ovn-nbctl $cmd + cmd="" + fi done -check $cmd +check ovn-nbctl --wait=sb $cmd check_row_count nb:Logical_Switch 4097 wait_row_count sb:Datapath_Binding 4095