Skip to contentSkip to conversation

tests/qtest: failover: fix infinite loop

PATCH Applied Laurent Vivier 4 participants 8 messages Mar 29, 2022 – Apr 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/qtest: failover: fix infinite loop

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

---
 tests/qtest/virtio-net-failover.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
tests/qtest/virtio-net-failover.c +25 -4
index 80292eecf65f..78811f1c9216 100644
@@ -1141,6 +1141,11 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "active") == 0) {
             qobject_unref(ret);
             break;
@@ -1155,8 +1160,12 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
 
     while (true) {
         ret = migrate_status(qts);
-
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "cancelled") == 0) {
             qobject_unref(ret);
             break;
@@ -1169,6 +1178,7 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
     check_one_card(qts, true, "standby0", MAC_STANDBY0);
     check_one_card(qts, false, "primary0", MAC_PRIMARY0);
 
+out:
     qos_object_destroy((QOSGraphObject *)vdev);
     machine_stop(qts);
 }
@@ -1251,8 +1261,7 @@ static void test_migrate_abort_wait_unplug(gconstpointer opaque)
             qobject_unref(ret);
             break;
         }
-        g_assert_cmpstr(status, !=, "failed");
-        g_assert_cmpstr(status, !=, "active");
+        g_assert_cmpstr(status, ==, "cancelling");
         qobject_unref(ret);
     }
 
@@ -1324,11 +1333,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        g_assert_cmpstr(status, !=, "failed");
         if (strcmp(status, "wait-unplug") != 0) {
             qobject_unref(ret);
             break;
         }
-        g_assert_cmpstr(status, !=, "failed");
         qobject_unref(ret);
     }
 
@@ -1340,6 +1349,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "cancelled") == 0) {
             qobject_unref(ret);
             break;
@@ -1352,6 +1366,7 @@ static void test_migrate_abort_active(gconstpointer opaque)
     check_one_card(qts, true, "standby0", MAC_STANDBY0);
     check_one_card(qts, true, "primary0", MAC_PRIMARY0);
 
+out:
     qos_object_destroy((QOSGraphObject *)vdev);
     machine_stop(qts);
 }
@@ -1425,6 +1440,11 @@ static void test_migrate_off_abort(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "cancelled") == 0) {
             qobject_unref(ret);
             break;
@@ -1437,6 +1457,7 @@ static void test_migrate_off_abort(gconstpointer opaque)
     check_one_card(qts, true, "standby0", MAC_STANDBY0);
     check_one_card(qts, true, "primary0", MAC_PRIMARY0);
 
+out:
     qos_object_destroy((QOSGraphObject *)vdev);
     machine_stop(qts);
 }
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 106 lines · Laurent Vivier

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

---
  tests/qtest/virtio-net-failover.c | 29 +++++++++++++++++++++++++----
  1 file changed, 25 insertions(+), 4 deletions(-)
tests/qtest/virtio-net-failover.c +24 -4
index 80292eecf65f..78811f1c9216 100644
@@ -1141,6 +1141,11 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
          ret = migrate_status(qts);
 
          status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
          if (strcmp(status, "active") == 0) {
              qobject_unref(ret);
              break;
@@ -1155,8 +1160,12 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
 
      while (true) {
          ret = migrate_status(qts);
-
          status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
          if (strcmp(status, "cancelled") == 0) {
              qobject_unref(ret);
              break;
@@ -1169,6 +1178,7 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
      check_one_card(qts, true, "standby0", MAC_STANDBY0);
      check_one_card(qts, false, "primary0", MAC_PRIMARY0);
 
+out:
      qos_object_destroy((QOSGraphObject *)vdev);
      machine_stop(qts);
  }
@@ -1251,8 +1261,7 @@ static void test_migrate_abort_wait_unplug(gconstpointer opaque)
              qobject_unref(ret);
              break;
          }
-        g_assert_cmpstr(status, !=, "failed");
-        g_assert_cmpstr(status, !=, "active");
+        g_assert_cmpstr(status, ==, "cancelling");
          qobject_unref(ret);
      }
 
@@ -1324,11 +1333,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
          ret = migrate_status(qts);
 
          status = qdict_get_str(ret, "status");
+        g_assert_cmpstr(status, !=, "failed");
          if (strcmp(status, "wait-unplug") != 0) {
              qobject_unref(ret);
              break;
          }
-        g_assert_cmpstr(status, !=, "failed");
          qobject_unref(ret);
      }
 
@@ -1340,6 +1349,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
          ret = migrate_status(qts);
 
          status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
          if (strcmp(status, "cancelled") == 0) {
              qobject_unref(ret);
              break;
@@ -1352,6 +1366,7 @@ static void test_migrate_abort_active(gconstpointer opaque)
      check_one_card(qts, true, "standby0", MAC_STANDBY0);
      check_one_card(qts, true, "primary0", MAC_PRIMARY0);
 
+out:
      qos_object_destroy((QOSGraphObject *)vdev);
      machine_stop(qts);
  }
@@ -1425,6 +1440,11 @@ static void test_migrate_off_abort(gconstpointer opaque)
          ret = migrate_status(qts);
 
          status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
          if (strcmp(status, "cancelled") == 0) {
              qobject_unref(ret);
              break;

tests/qtest/virtio-net-failover.c static void test_migrate_off_abort(gconstpointer opaque) · line 1463

Quoted 7 lines
tests/qtest/virtio-net-failover.c +1 -0
@@ -1437,6 +1457,7 @@ static void test_migrate_off_abort(gconstpointer opaque)
      check_one_card(qts, true, "standby0", MAC_STANDBY0);
      check_one_card(qts, true, "primary0", MAC_PRIMARY0);
 
+out:
      qos_object_destroy((QOSGraphObject *)vdev);
      machine_stop(qts);
  }

Is this still urgent for 7.0, or can it wait for the 7.1 cycle?

Thomas

#2 lore raw
Quoted 10 lines · Thomas Huth
Quoted 6 lines · Laurent Vivier

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

Is this still urgent for 7.0, or can it wait for the 7.1 cycle?

It's a test case change that fixes at least one hang I've seen in "make check". I prefer those to go in, at least before rc3, because the CI loop being unreliable makes the whole release process slower and more annoying.

thanks
-- PMM

#3 lore raw
Quoted 10 lines · Peter Maydell
Quoted 8 lines · Thomas Huth
Quoted 6 lines · Laurent Vivier

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

Quoted 6 lines
Quoted 1 line

Is this still urgent for 7.0, or can it wait for the 7.1 cycle?

It's a test case change that fixes at least one hang I've seen in "make check". I prefer those to go in, at least before rc3, because the CI loop being unreliable makes the whole release process slower and more annoying.

Ok. Do you want to pick it directly, or shall I create a pull request for this? (I don't have much else queued right now, that's why I ask)

Thomas

#4 lore raw
Quoted 14 lines · Thomas Huth
Quoted 12 lines · Peter Maydell
Quoted 10 lines · Thomas Huth
Quoted 6 lines · Laurent Vivier

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

Is this still urgent for 7.0, or can it wait for the 7.1 cycle?

Quoted 7 lines
Quoted 4 lines

It's a test case change that fixes at least one hang I've seen in "make check". I prefer those to go in, at least before rc3, because the CI loop being unreliable makes the whole release process slower and more annoying.

Ok. Do you want to pick it directly, or shall I create a pull request for this? (I don't have much else queued right now, that's why I ask)

I can apply it directly if you don't have anything else you're sending anyway.

thanks
-- PMM

#5 lore raw
Quoted 20 lines · Peter Maydell
Quoted 19 lines · Thomas Huth
Quoted 16 lines · Peter Maydell
Quoted 10 lines · Thomas Huth
Quoted 6 lines · Laurent Vivier

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

Is this still urgent for 7.0, or can it wait for the 7.1 cycle?

It's a test case change that fixes at least one hang I've seen in "make check". I prefer those to go in, at least before rc3, because the CI loop being unreliable makes the whole release process slower and more annoying.

Quoted 5 lines
Quoted 2 lines

Ok. Do you want to pick it directly, or shall I create a pull request for this? (I don't have much else queued right now, that's why I ask)

I can apply it directly if you don't have anything else you're sending anyway.

Ok, then please apply directly! Thanks!

Thomas

#6 lore raw
In reply to Laurent Vivier
Quoted 5 lines · Laurent Vivier

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

Quoted 7 lines

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

---
 tests/qtest/virtio-net-failover.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

Applied to master, thanks.

-- PMM

#7 lore raw
In reply to Laurent Vivier
Quoted 8 lines · * Laurent Vivier ([email protected]) wrote:

If the migration is over before we cancel it, we are waiting in a loop a state that never comes because the state is already "completed".

To avoid an infinite loop, skip the test if the migration is "completed" before we were able to cancel it.

If you're finding it's skipping to often, you might try setting the migration bandwidth really low right at the start (a few bytes/second) to ensure it doesn't complete under your feet.

Dave

Quoted 108 lines
---
 tests/qtest/virtio-net-failover.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
tests/qtest/virtio-net-failover.c +25 -4
index 80292eecf65f..78811f1c9216 100644
@@ -1141,6 +1141,11 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "active") == 0) {
             qobject_unref(ret);
             break;
@@ -1155,8 +1160,12 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
 
     while (true) {
         ret = migrate_status(qts);
-
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "cancelled") == 0) {
             qobject_unref(ret);
             break;
@@ -1169,6 +1178,7 @@ static void test_migrate_guest_off_abort(gconstpointer opaque)
     check_one_card(qts, true, "standby0", MAC_STANDBY0);
     check_one_card(qts, false, "primary0", MAC_PRIMARY0);
 
+out:
     qos_object_destroy((QOSGraphObject *)vdev);
     machine_stop(qts);
 }
@@ -1251,8 +1261,7 @@ static void test_migrate_abort_wait_unplug(gconstpointer opaque)
             qobject_unref(ret);
             break;
         }
-        g_assert_cmpstr(status, !=, "failed");
-        g_assert_cmpstr(status, !=, "active");
+        g_assert_cmpstr(status, ==, "cancelling");
         qobject_unref(ret);
     }
 
@@ -1324,11 +1333,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        g_assert_cmpstr(status, !=, "failed");
         if (strcmp(status, "wait-unplug") != 0) {
             qobject_unref(ret);
             break;
         }
-        g_assert_cmpstr(status, !=, "failed");
         qobject_unref(ret);
     }
 
@@ -1340,6 +1349,11 @@ static void test_migrate_abort_active(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "cancelled") == 0) {
             qobject_unref(ret);
             break;
@@ -1352,6 +1366,7 @@ static void test_migrate_abort_active(gconstpointer opaque)
     check_one_card(qts, true, "standby0", MAC_STANDBY0);
     check_one_card(qts, true, "primary0", MAC_PRIMARY0);
 
+out:
     qos_object_destroy((QOSGraphObject *)vdev);
     machine_stop(qts);
 }
@@ -1425,6 +1440,11 @@ static void test_migrate_off_abort(gconstpointer opaque)
         ret = migrate_status(qts);
 
         status = qdict_get_str(ret, "status");
+        if (strcmp(status, "completed") == 0) {
+            g_test_skip("Failed to cancel the migration");
+            qobject_unref(ret);
+            goto out;
+        }
         if (strcmp(status, "cancelled") == 0) {
             qobject_unref(ret);
             break;
@@ -1437,6 +1457,7 @@ static void test_migrate_off_abort(gconstpointer opaque)
     check_one_card(qts, true, "standby0", MAC_STANDBY0);
     check_one_card(qts, true, "primary0", MAC_PRIMARY0);
 
+out:
     qos_object_destroy((QOSGraphObject *)vdev);
     machine_stop(qts);
 }
Signature · 1 line
2.35.1
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK