Skip to contentSkip to conversation

iotests: fix race in 030

PATCH Applied John Snow 5 participants 5 messages Nov 11, 2015 – Nov 16, 2015

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 iotests: fix race in 030

the stop_test case tests that we can resume a block-stream command after it has stopped/paused due to error. We cannot always reliably query it before it finishes after resume, though, so make this a conditional.

The important thing is that we are still testing that it has stopped, and that it finishes successfully after we send a resume command.

---
 tests/qemu-iotests/030 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +4 -1
index 952a524..fd0d186 100755
@@ -245,6 +245,7 @@ class TestEIO(TestErrors):
         while not completed:
             for event in self.vm.get_qmp_events(wait=True):
                 if event['event'] == 'BLOCK_JOB_ERROR':
+                    error = True
                     self.assert_qmp(event, 'data/device', 'drive0')
                     self.assert_qmp(event, 'data/operation', 'read')
 
@@ -257,9 +258,11 @@ class TestEIO(TestErrors):
                     self.assert_qmp(result, 'return', {})
 
                     result = self.vm.qmp('query-block-jobs')
+                    if (result == {'return': []}):
+                        # Race; likely already finished. Check.
+                        continue
                     self.assert_qmp(result, 'return[0]/paused', False)
                     self.assert_qmp(result, 'return[0]/io-status', 'ok')
-                    error = True
                 elif event['event'] == 'BLOCK_JOB_COMPLETED':
                     self.assertTrue(error, 'job completed unexpectedly')
                     self.assert_qmp(event, 'data/type', 'stream')
Signature · 1 line
2.4.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 41 lines · John Snow

the stop_test case tests that we can resume a block-stream command after it has stopped/paused due to error. We cannot always reliably query it before it finishes after resume, though, so make this a conditional.

The important thing is that we are still testing that it has stopped, and that it finishes successfully after we send a resume command.

---
 tests/qemu-iotests/030 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +4 -1
index 952a524..fd0d186 100755
@@ -245,6 +245,7 @@ class TestEIO(TestErrors):
         while not completed:
             for event in self.vm.get_qmp_events(wait=True):
                 if event['event'] == 'BLOCK_JOB_ERROR':
+                    error = True
                     self.assert_qmp(event, 'data/device', 'drive0')
                     self.assert_qmp(event, 'data/operation', 'read')
 
@@ -257,9 +258,11 @@ class TestEIO(TestErrors):
                     self.assert_qmp(result, 'return', {})
 
                     result = self.vm.qmp('query-block-jobs')
+                    if (result == {'return': []}):
+                        # Race; likely already finished. Check.
+                        continue
                     self.assert_qmp(result, 'return[0]/paused', False)
                     self.assert_qmp(result, 'return[0]/io-status', 'ok')
-                    error = True
                 elif event['event'] == 'BLOCK_JOB_COMPLETED':
                     self.assertTrue(error, 'job completed unexpectedly')
                     self.assert_qmp(event, 'data/type', 'stream')
Signature · 1 line
2.4.3
Reviewed-by on v1 1/1
#2 lore raw
In reply to John Snow
Quoted 9 lines · John Snow

the stop_test case tests that we can resume a block-stream command after it has stopped/paused due to error. We cannot always reliably query it before it finishes after resume, though, so make this a conditional.

The important thing is that we are still testing that it has stopped, and that it finishes successfully after we send a resume command.

Berto

Reviewed-by on v1 1/1
#3 lore raw
In reply to John Snow
Quoted 26 lines · John Snow

the stop_test case tests that we can resume a block-stream command after it has stopped/paused due to error. We cannot always reliably query it before it finishes after resume, though, so make this a conditional.

The important thing is that we are still testing that it has stopped, and that it finishes successfully after we send a resume command.

---
 tests/qemu-iotests/030 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +1 -0
index 952a524..fd0d186 100755
@@ -245,6 +245,7 @@ class TestEIO(TestErrors):
         while not completed:
             for event in self.vm.get_qmp_events(wait=True):
                 if event['event'] == 'BLOCK_JOB_ERROR':
+                    error = True
                     self.assert_qmp(event, 'data/device', 'drive0')
                     self.assert_qmp(event, 'data/operation', 'read')
 

tests/qemu-iotests/030 class TestEIO(TestErrors): · line 261

Quoted 4 lines
tests/qemu-iotests/030 +1 -0
@@ -257,9 +258,11 @@ class TestEIO(TestErrors):
                     self.assert_qmp(result, 'return', {})
 
                     result = self.vm.qmp('query-block-jobs')
+                    if (result == {'return': []}):

Using parenthisis around if conditions is not native Python but "(scalar)" equals to "scalar", so the statement is still correct. Maybe this could be fixed when applying, or even if it stays as is:

Quoted 12 lines
tests/qemu-iotests/030 +2 -1
+                        # Race; likely already finished. Check.
+                        continue
                     self.assert_qmp(result, 'return[0]/paused', False)
                     self.assert_qmp(result, 'return[0]/io-status', 'ok')
-                    error = True
                 elif event['event'] == 'BLOCK_JOB_COMPLETED':
                     self.assertTrue(error, 'job completed unexpectedly')
                     self.assert_qmp(event, 'data/type', 'stream')
Signature · 1 line
2.4.3
Applied
#4 lore raw
In reply to John Snow

Am 11.11.2015 um 21:27 hat John Snow geschrieben:

Quoted 9 lines

the stop_test case tests that we can resume a block-stream command after it has stopped/paused due to error. We cannot always reliably query it before it finishes after resume, though, so make this a conditional.

The important thing is that we are still testing that it has stopped, and that it finishes successfully after we send a resume command.

Thanks, applied to the block branch.

Kevin