Peter Xu <pet...@redhat.com> writes:
> On Tue, Jun 19, 2018 at 03:53:11PM +0200, Markus Armbruster wrote:
>> Peter Xu <pet...@redhat.com> writes:
>>
>> > Previously we clean up the queues when we got CLOSED event. It was used
>> > to make sure we won't send leftover replies/events of a old client to a
>> > new client which makes perfect sense. However this will also drop the
>> > replies/events even if the output port of the previous chardev backend
>> > is still open, which can lead to missing of the last replies/events.
>> > Now this patch does an extra operation to flush the response queue
>> > before cleaning up.
>> >
>> > In most cases, a QMP session will be based on a bidirectional channel (a
>> > TCP port, for example, we read/write to the same socket handle), so in
>> > port and out port of the backend chardev are fundamentally the same
>> > port. In these cases, it does not really matter much on whether we'll
>> > flush the response queue since flushing will fail anyway. However there
>> > can be cases where in & out ports of the QMP monitor's backend chardev
>> > are separated. Here is an example:
>> >
>> > cat $QMP_COMMANDS | qemu -qmp stdio ... | filter_commands
>> >
>> > In this case, the backend is fd-typed, and it is connected to stdio
>> > where in port is stdin and out port is stdout. Now if we drop all the
>> > events on the response queue then filter_command process might miss some
>> > events that it might expect. The thing is that, when stdin closes,
>> > stdout might still be there alive!
>> >
>> > In practice, I encountered SHUTDOWN event missing when running test with
>> > iotest 087 with Out-Of-Band enabled. Here is one of the ways that this
>> > can happen (after "quit" command is executed and QEMU quits the main
>> > loop):
>> >
>> > 1. [main thread] QEMU queues a SHUTDOWN event into response queue.
>> >
>> > 2. "cat" terminates (to distinguish it from the animal, I quote it).
>> >
>> > 3. [monitor iothread] QEMU's monitor iothread reads EOF from stdin.
>> >
>> > 4. [monitor iothread] QEMU's monitor iothread calls the CLOSED event
>> > hook for the monitor, which will destroy the response queue of the
>> > monitor, then the SHUTDOWN event is dropped.
>> >
>> > 5. [main thread] QEMU's main thread cleans up the monitors in
>> > monitor_cleanup(). When trying to flush pending responses, it sees
>> > nothing. SHUTDOWN is lost forever.
>> >
>> > Note that before the monitor iothread was introduced, step [4]/[5] could
>> > never happen since the main loop was the only place to detect the EOF
>> > event of stdin and run the CLOSED event hooks. Now things can happen in
>> > parallel in the iothread.
>> >
>> > Without this patch, iotest 087 will have ~10% chance to miss the
>> > SHUTDOWN event and fail when with Out-Of-Band enabled (the output is
>> > manually touched up to suite line width requirement):
>>
>> I wouldn't wrap lines when quoting a diff.
>>
>> >
>> > --- /home/peterx/git/qemu/tests/qemu-iotests/087.out
>> > +++ /home/peterx/git/qemu/bin/tests/qemu-iotests/087.out.bad
>> > @@ -8,7 +8,6 @@
>> > {"return": {}}
>> > {"error": {"class": "GenericError", "desc": "'node-name' must be
>> > specified for the root node"}}
>> > {"return": {}}
>> > -{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
>> > - "event": "SHUTDOWN", "data": {"guest": false}}
>> >
>> > === Duplicate ID ===
>> > @@ -53,7 +52,6 @@
>> > {"return": {}}
>> > {"return": {}}
>> > {"return": {}}
>> >
>> > -{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
>> > - "event": "SHUTDOWN", "data": {"guest": false}}
>>
>> Please indent the quoted diff a bit, so make it more obviously not part
>> of the patch. In fact, git-am chokes on it for me.
>
> To make it even simpler, I plan to remove the whole chunk of the diff
> from the commit message if you won't disagree.
In general, I rather like having test failure details in the commit
message. In this particular case, however, the diff is probably not
necessary, as "iotest 087 will have ~10% chance to miss the SHUTDOWN
event" is clear enough.
>> >
>> > This patch fixes the problem.
>> >
>> > Fixes: 6d2d563f8c ("qmp: cleanup qmp queues properly", 2018-03-27)
>> > Suggested-by: Markus Armbruster <arm...@redhat.com>
>> > Signed-off-by: Peter Xu <pet...@redhat.com>
>> >
>> > Signed-off-by: Peter Xu <pet...@redhat.com>
>> > ---
>> > monitor.c | 33 ++++++++++++++++++++++++++++++---
>> > 1 file changed, 30 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/monitor.c b/monitor.c
>> > index d4a463f707..c9a02ee40c 100644
>> > --- a/monitor.c
>> > +++ b/monitor.c
[...]
>> > @@ -4364,6 +4383,14 @@ static void monitor_qmp_event(void *opaque, int
>> > event)
>> > mon_refcount++;
>> > break;
>> > case CHR_EVENT_CLOSED:
>> > + /*
>> > + * Note: this is only useful when the output of the chardev
>> > + * backend is still open. For example, when the backend is
>> > + * stdio, it's possible that stdout is still open when stdin
>> > + * is closed. After all, CHR_EVENT_CLOSED event is currently
>> > + * only bound to stdin.
>> > + */
>>
>> I'm not sure I get the last sentence. What do you mean by "bound to
>> stdin"?
>
> I want to express that the event is only related to the state of
> stdin, meanwhile it's never related to the state of stdout. How about
> I remove the sentence after "after all"? I think it's clear enough
> with the rest of the comments.
Works for me.
[...]
