aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-07-03 10:53:42 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-07-03 23:18:56 +0200
commite8f4a22168f573633f31fad3d6bfcbe5f0259b28 (patch)
tree27ee5839e98ec4db866a568c5bde37a499506ec1
parentb27314567d4cd8e204a18feba60d3341fb2d1aed (diff)
tests/qmp-test: Demonstrate QMP errors jumping the queue
When OOB is enabled, out-of-band commands are executed right away, everything else is queued. This lets out-of-band commands "jump the queue". However, certain errors are always reported right away, and therefore can jump the queue even when the erroneous input does not request out-of-band execution. These errors are pretty unlikely to occur in production, but it's wrong all the same. Mark FIXME. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Message-Id: <20180703085358.13941-17-armbru@redhat.com>
-rw-r--r--monitor.c1
-rw-r--r--tests/qmp-test.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c
index 37ca4e798d..c49214cd8f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4339,6 +4339,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
return;
err:
+ /* FIXME overtakes queued in-band commands, wrong when !qmp_is_oob() */
monitor_qmp_respond(mon, NULL, err, NULL);
qobject_unref(req);
}
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index a7b6ec98e4..9eb20a1a18 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -241,6 +241,13 @@ static void test_qmp_oob(void)
unblock_blocked_cmd();
recv_cmd_id(qts, "ib-blocks-1");
recv_cmd_id(qts, "ib-quick-1");
+
+ /* FIXME certain in-band errors overtake slow in-band command */
+ send_cmd_that_blocks(qts, "blocks-2");
+ qtest_async_qmp(qts, "{ 'id': 'err-2' }");
+ recv_cmd_id(qts, NULL);
+ unblock_blocked_cmd();
+ recv_cmd_id(qts, "blocks-2");
cleanup_blocking_cmd();
qtest_quit(qts);