[PATCH 24/42] migration-test: Re-enable multifd_cancel test

Juan Quintela posted 42 patches 2 years, 8 months ago
Maintainers: Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>
[PATCH 24/42] migration-test: Re-enable multifd_cancel test
Posted by Juan Quintela 2 years, 8 months ago
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/qtest/migration-test.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 01ab51a391..9f86d9bc80 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -2886,14 +2886,8 @@ int main(int argc, char **argv)
     }
     qtest_add_func("/migration/multifd/tcp/plain/none",
                    test_multifd_tcp_none);
-    /*
-     * This test is flaky and sometimes fails in CI and otherwise:
-     * don't run unless user opts in via environment variable.
-     */
-    if (getenv("QEMU_TEST_FLAKY_TESTS")) {
-        qtest_add_func("/migration/multifd/tcp/plain/cancel",
-                       test_multifd_tcp_cancel);
-    }
+    qtest_add_func("/migration/multifd/tcp/plain/cancel",
+                   test_multifd_tcp_cancel);
     qtest_add_func("/migration/multifd/tcp/plain/zlib",
                    test_multifd_tcp_zlib);
 #ifdef CONFIG_ZSTD
-- 
2.40.1
Re: [PATCH 24/42] migration-test: Re-enable multifd_cancel test
Posted by Daniel P. Berrangé 2 years, 8 months ago
On Fri, Jun 09, 2023 at 12:49:25AM +0200, Juan Quintela wrote:

Please explain why this is considered ok, given the comment about
why it is disabled. ie if we fixed something, refrence the commit.

> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/qtest/migration-test.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index 01ab51a391..9f86d9bc80 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -2886,14 +2886,8 @@ int main(int argc, char **argv)
>      }
>      qtest_add_func("/migration/multifd/tcp/plain/none",
>                     test_multifd_tcp_none);
> -    /*
> -     * This test is flaky and sometimes fails in CI and otherwise:
> -     * don't run unless user opts in via environment variable.
> -     */
> -    if (getenv("QEMU_TEST_FLAKY_TESTS")) {
> -        qtest_add_func("/migration/multifd/tcp/plain/cancel",
> -                       test_multifd_tcp_cancel);
> -    }
> +    qtest_add_func("/migration/multifd/tcp/plain/cancel",
> +                   test_multifd_tcp_cancel);
>      qtest_add_func("/migration/multifd/tcp/plain/zlib",
>                     test_multifd_tcp_zlib);
>  #ifdef CONFIG_ZSTD
> -- 
> 2.40.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [PATCH 24/42] migration-test: Re-enable multifd_cancel test
Posted by Juan Quintela 2 years, 8 months ago
Daniel P. Berrangé <berrange@redhat.com> wrote:
> On Fri, Jun 09, 2023 at 12:49:25AM +0200, Juan Quintela wrote:
>
> Please explain why this is considered ok, given the comment about
> why it is disabled. ie if we fixed something, refrence the commit.

I did in the cover letter, will put that on the commit:

- We used to share dest_serial file for the two targets of migration (to
  and to2), where we have a race.

- this series fixes the races in two ways:

  * we wait for "to" to finish before we launch "to2", so the race can't
    happen.

  * One of the reasons why I created GuestState is that I needed a place
    to store the serial file name (now I call it "target" and "target2").

- I put on the cover letter that this is not enough, we also need
  Fabiano fix for the thread list.

- Peter Mayel was the most vocal about this particular failure, I cc'd
  him and asked on the cover letter for the people to used to have
  failures to test.

So how should I handled this to be clearer?

Later, Juan.

>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>>  tests/qtest/migration-test.c | 10 ++--------
>>  1 file changed, 2 insertions(+), 8 deletions(-)
>> 
>> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
>> index 01ab51a391..9f86d9bc80 100644
>> --- a/tests/qtest/migration-test.c
>> +++ b/tests/qtest/migration-test.c
>> @@ -2886,14 +2886,8 @@ int main(int argc, char **argv)
>>      }
>>      qtest_add_func("/migration/multifd/tcp/plain/none",
>>                     test_multifd_tcp_none);
>> -    /*
>> -     * This test is flaky and sometimes fails in CI and otherwise:
>> -     * don't run unless user opts in via environment variable.
>> -     */
>> -    if (getenv("QEMU_TEST_FLAKY_TESTS")) {
>> -        qtest_add_func("/migration/multifd/tcp/plain/cancel",
>> -                       test_multifd_tcp_cancel);
>> -    }
>> +    qtest_add_func("/migration/multifd/tcp/plain/cancel",
>> +                   test_multifd_tcp_cancel);
>>      qtest_add_func("/migration/multifd/tcp/plain/zlib",
>>                     test_multifd_tcp_zlib);
>>  #ifdef CONFIG_ZSTD
>> -- 
>> 2.40.1
>> 
>
> With regards,
> Daniel
Re: [PATCH 24/42] migration-test: Re-enable multifd_cancel test
Posted by Daniel P. Berrangé 2 years, 8 months ago
On Fri, Jun 09, 2023 at 12:22:33PM +0200, Juan Quintela wrote:
> Daniel P. Berrangé <berrange@redhat.com> wrote:
> > On Fri, Jun 09, 2023 at 12:49:25AM +0200, Juan Quintela wrote:
> >
> > Please explain why this is considered ok, given the comment about
> > why it is disabled. ie if we fixed something, refrence the commit.
> 
> I did in the cover letter, will put that on the commit:
> 
> - We used to share dest_serial file for the two targets of migration (to
>   and to2), where we have a race.
> 
> - this series fixes the races in two ways:
> 
>   * we wait for "to" to finish before we launch "to2", so the race can't
>     happen.
> 
>   * One of the reasons why I created GuestState is that I needed a place
>     to store the serial file name (now I call it "target" and "target2").
> 
> - I put on the cover letter that this is not enough, we also need
>   Fabiano fix for the thread list.
> 
> - Peter Mayel was the most vocal about this particular failure, I cc'd
>   him and asked on the cover letter for the people to used to have
>   failures to test.
> 
> So how should I handled this to be clearer?

Details just need to be in the commit message, because cover letters
aren't visible when someone is looking back at 'git log' to find out
why the test was re-enabled.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|