]> git.proxmox.com Git - mirror_qemu.git/commitdiff
tests/migration: Add some slack to auto converge
authorDr. David Alan Gilbert <dgilbert@redhat.com>
Mon, 10 Feb 2020 19:57:31 +0000 (19:57 +0000)
committerJuan Quintela <quintela@redhat.com>
Thu, 13 Feb 2020 09:57:35 +0000 (10:57 +0100)
There's an assert in autoconverge that checks that we quit the
iteration when we go below the expected threshold.  Philippe
saw a case where this assert fired with the measured value
slightly over the threshold. (about 3k out of a few million).

I can think of two reasons:
  a) Rounding errors
  b) That after we make the decision to quit iteration we do one
    more sync and that sees a few more dirty pages.

So add 1% slack to the assertion, that should cover a and
most cases of b, probably all we'll see for the test.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
tests/qtest/migration-test.c

index cf27ebbc9d3b1a63ab0b0a621f78feebfca7926d..a78ac0c7da7d240a903c50013b934e675887abdc 100644 (file)
@@ -1237,7 +1237,8 @@ static void test_migrate_auto_converge(void)
     g_assert_cmpint(percentage, <=, max_pct);
 
     remaining = read_ram_property_int(from, "remaining");
-    g_assert_cmpint(remaining, <, expected_threshold);
+    g_assert_cmpint(remaining, <,
+                    (expected_threshold + expected_threshold / 100));
 
     migrate_continue(from, "pre-switchover");