From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F99FC433E0 for ; Tue, 12 Jan 2021 13:33:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C3CF20771 for ; Tue, 12 Jan 2021 13:33:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C3CF20771 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzJnd-0008Fd-0s for qemu-devel@archiver.kernel.org; Tue, 12 Jan 2021 08:33:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzJle-0007Xs-AR for qemu-devel@nongnu.org; Tue, 12 Jan 2021 08:31:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kzJlb-000126-BW for qemu-devel@nongnu.org; Tue, 12 Jan 2021 08:31:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610458282; 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: in-reply-to:in-reply-to:references:references; bh=K6dw8AqhvqT6netEZDIvWx5D5gUg6rGjhfV2UplsD5E=; b=fXqR/VYyq85TbtGWxRKaCbl9MVYhM8bGUkaT4Id/WErv69q5qcavYp2kCWkLXFYPrE4RtW ondKmZhNvEIYSKwQqtWOQVC8pKvU97cWmmh0wetywQPtKrodbRY9CSmg4xAvc0GqrXoG3b 9Dt+0JYC+PQwuLu+w9Fj4hPP+DOr9cg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-zWvxVElZPUi0ZpCaMECIbg-1; Tue, 12 Jan 2021 08:31:19 -0500 X-MC-Unique: zWvxVElZPUi0ZpCaMECIbg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D51C801AC9; Tue, 12 Jan 2021 13:31:18 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-184.ams2.redhat.com [10.36.112.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 635AB5C1B4; Tue, 12 Jan 2021 13:31:12 +0000 (UTC) Subject: Re: [PATCH] tests/acceptance: Fix race conditions in s390x tests & skip fedora on gitlab-CI To: Cornelia Huck , =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20210108185645.86351-1-thuth@redhat.com> <20210112115305.1cd5b8c5.cohuck@redhat.com> <877doinznw.fsf@linaro.org> <20210112132338.4122061b.cohuck@redhat.com> From: Thomas Huth Message-ID: Date: Tue, 12 Jan 2021 14:31:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210112132338.4122061b.cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Cleber Rosa , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/01/2021 13.23, Cornelia Huck wrote: > On Tue, 12 Jan 2021 11:32:44 +0000 > Alex Bennée wrote: > >> Cornelia Huck writes: >> >>> On Fri, 8 Jan 2021 19:56:45 +0100 >>> Thomas Huth wrote: >>> >>>> There was a race condition in the first test where there was already the >>>> "crw" output in the dmesg, but the "0.0.4711" entry has not been created >>>> in the /sys fs yet. Fix it by waiting until it is there. >>>> >>>> The second test has even more problems on gitlab-CI. Even after adding some >>>> more synchronization points (that wait for some messages in the "dmesg" >>>> output to make sure that the modules got loaded correctly), there are still >>>> occasionally some hangs in this test when it is running in the gitlab-CI. >>>> So far I was unable to reproduce these hangs locally on my computer, so >>>> this issue might take a while to debug. Thus disable the 2nd test in the >>>> gitlab-CI until the problems are better understood and fixed. >>>> >>>> Signed-off-by: Thomas Huth >>>> --- >>>> tests/acceptance/machine_s390_ccw_virtio.py | 14 ++++++++++++-- >>>> 1 file changed, 12 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py >>>> index eccf26b262..4028c99afc 100644 >>>> --- a/tests/acceptance/machine_s390_ccw_virtio.py >>>> +++ b/tests/acceptance/machine_s390_ccw_virtio.py >>>> @@ -12,6 +12,7 @@ >>>> import os >>>> import tempfile >>>> >>>> +from avocado import skipIf >>>> from avocado_qemu import Test >>>> from avocado_qemu import exec_command_and_wait_for_pattern >>>> from avocado_qemu import wait_for_console_pattern >>>> @@ -133,8 +134,10 @@ class S390CCWVirtioMachine(Test): >>>> self.vm.command('device_add', driver='virtio-net-ccw', >>>> devno='fe.0.4711', id='net_4711') >>>> self.wait_for_crw_reports() >>>> - exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/', >>>> - '0.0.4711') >>>> + exec_command_and_wait_for_pattern(self, 'for i in 1 2 3 4 5 6 7 ; do ' >>>> + 'if [ -e /sys/bus/ccw/devices/*4711 ]; then break; fi ;' >>>> + 'sleep 1 ; done ; ls /sys/bus/ccw/devices/', >>>> + '0.0.4711') >>> >>> I'm wondering whether we should introduce a generic helper function for >>> "execute command repeatedly, if the expected result did not yet show >>> up", or "wait for a file/directory to exist". It's probably not >>> uncommon for a desired outcome to arrive asynchronously, and having a >>> function for waiting/retrying could be handy. >> >> We don't really want to encourage fragile shell scripts in the guest so >> something that makes it easy to encode these loops in python. Currently >> the _console_interaction helper fails the test if failure_message is >> seen so I guess we need a slightly more liberal interaction which >> accepts a command can fail so we can write something like: >> >> while True: >> if exec_command_and_check(self, "stat -t /sys/bus/ccw/devices/0.0.4711", >> "/sys/bus/ccw/devices/0.0.4711"): >> break >> >> ? > > Yes, something like that. The caller can decide whether they want to > limit retries. Fine for me, but I think we should use a timeout, not an amount of retries. I already put my patch into my pull-request yesterday (so that people are not running into failures with their gitlab-CI), so if someone wants to have a go at creating such a function in python, feel free to do so by refactoring that code again. Thomas