From patchwork Thu Dec 7 13:11:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1873194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=iYxvYiAi; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SmF6c5rhrz23nW for ; Fri, 8 Dec 2023 00:12:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E32F04227E; Thu, 7 Dec 2023 13:12:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E32F04227E 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=iYxvYiAi 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 pqlyEEYwLq_9; Thu, 7 Dec 2023 13:12:04 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id D7E6B41B48; Thu, 7 Dec 2023 13:12:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D7E6B41B48 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9C226C0077; Thu, 7 Dec 2023 13:12:03 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3438AC0037 for ; Thu, 7 Dec 2023 13:12:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F33F960BBC for ; Thu, 7 Dec 2023 13:12:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F33F960BBC Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iYxvYiAi X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TL0auvJ23nbh for ; Thu, 7 Dec 2023 13:12:01 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 34EA960AFB for ; Thu, 7 Dec 2023 13:12:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 34EA960AFB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701954720; 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=zfaO8qqj/ori9FZszl9tR88jVoYcyw5wheeP0dN/9oY=; b=iYxvYiAix3yF2Dn10CLqCQKptyEVf0zIKAuFbd3l2Uq6DBRY37rO4uaUhoUYJMfP7MiAA2 2T94DYk+DQeTEjFuSSsBEQyWuDP7xDRvlXeW33ID0Z/8+YIFnYnAotsrevnyiVOxWPwWJO 8lqyYOfUX9ThTz8h79iJ30+5w0oeXrM= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-104-7EMVL6bXN8W-rcqFKEMu_g-1; Thu, 07 Dec 2023 08:11:58 -0500 X-MC-Unique: 7EMVL6bXN8W-rcqFKEMu_g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C8553813F2F; Thu, 7 Dec 2023 13:11:58 +0000 (UTC) Received: from dceara.remote.csb (unknown [10.39.194.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74ABF111E400; Thu, 7 Dec 2023 13:11:57 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Thu, 7 Dec 2023 14:11:54 +0100 Message-Id: <20231207131154.3549208-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Ilya Maximets Subject: [ovs-dev] [PATCH ovn] ovn-macros: Make sure stopped daemons continue before the test ends. 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" In case there's a test failure while daemons are stopped ensure that we send a SIGCONT on exit so that they properly clean up. 30952c248d4f ("binding: fixed ovn-installed not properly removed (recomputes)") Fixes: 0794a6edf40b ("qos: fix potential double deletion of ovs idl row") Fixes: feb918434172 ("northd: Skip transient IDL records.") Suggested-by: Ilya Maximets Signed-off-by: Dumitru Ceara Acked-by: Xavier Simonart --- tests/ovn-macros.at | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 94bdaff2c4..dd5df40b35 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -894,6 +894,7 @@ start_scapy_server() { sleep_northd() { echo Northd going to sleep AT_CHECK([kill -STOP $(cat northd/ovn-northd.pid)]) + on_exit "kill -CONT $(cat northd/ovn-northd.pid)" } wake_up_northd() { @@ -904,6 +905,7 @@ wake_up_northd() { sleep_sb() { echo SB going to sleep AT_CHECK([kill -STOP $(cat ovn-sb/ovsdb-server.pid)]) + on_exit "kill -CONT $(cat ovn-sb/ovsdb-server.pid)" } wake_up_sb() { echo SB waking up @@ -927,6 +929,7 @@ sleep_ovs() { hv=$1 echo ovs $hv going to sleep AT_CHECK([kill -STOP $(cat $hv/ovs-vswitchd.pid)]) + on_exit "kill -CONT $(cat $hv/ovs-vswitchd.pid)" } wake_up_ovs() { @@ -938,6 +941,7 @@ wake_up_ovs() { sleep_ovsdb() { echo OVSDB $1 going to sleep AT_CHECK([kill -STOP $(cat $1/ovsdb-server.pid)]) + on_exit "kill -CONT $(cat $1/ovsdb-server.pid)" } wake_up_ovsdb() { echo OVSDB $1 waking up