From: "Richard W.M. Jones" <rjones@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, eblake@redhat.com,
qemu-devel@nongnu.org
Subject: [PATCH v2] nbd/server: Suppress Broken pipe errors on abrupt disconnection
Date: Mon, 13 Sep 2021 16:19:36 +0100 [thread overview]
Message-ID: <20210913151936.392705-1-rjones@redhat.com> (raw)
$ rm -f /tmp/sock /tmp/pid
$ qemu-img create -f qcow2 /tmp/disk.qcow2 1M
$ qemu-nbd -t --format=qcow2 --socket=/tmp/sock --pid-file=/tmp/pid /tmp/disk.qcow2 &
$ nbdsh -u 'nbd+unix:///?socket=/tmp/sock' -c 'h.get_size()'
qemu-nbd: Disconnect client, due to: Failed to send reply: Unable to write to socket: Broken pipe
$ killall qemu-nbd
nbdsh is abruptly dropping the NBD connection here which is a valid
way to close the connection. It seems unnecessary to print an error
in this case so this commit suppresses it.
Note that if you call the nbdsh h.shutdown() method then the message
was not printed:
$ nbdsh -u 'nbd+unix:///?socket=/tmp/sock' -c 'h.get_size()' -c 'h.shutdown()'
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
nbd/server.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/nbd/server.c b/nbd/server.c
index 3927f7789d..e0a43802b2 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -2669,7 +2669,12 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = nbd_handle_request(client, &request, req->data, &local_err);
}
if (ret < 0) {
- error_prepend(&local_err, "Failed to send reply: ");
+ if (errno != EPIPE) {
+ error_prepend(&local_err, "Failed to send reply: ");
+ } else {
+ error_free(local_err);
+ local_err = NULL;
+ }
goto disconnect;
}
--
2.32.0
next reply other threads:[~2021-09-13 15:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 15:19 Richard W.M. Jones [this message]
2021-09-14 14:40 ` [PATCH v2] nbd/server: Suppress Broken pipe errors on abrupt disconnection Vladimir Sementsov-Ogievskiy
2021-09-14 14:52 ` Richard W.M. Jones
2021-09-14 15:21 ` Vladimir Sementsov-Ogievskiy
2021-09-14 16:32 ` Richard W.M. Jones
2021-09-15 7:15 ` Vladimir Sementsov-Ogievskiy
2021-09-15 9:00 ` Richard W.M. Jones
2021-09-15 9:11 ` Vladimir Sementsov-Ogievskiy
2021-09-17 16:10 ` Eric Blake
2021-09-17 16:05 ` Eric Blake
2021-09-14 19:06 ` Eric Blake
2021-09-14 19:01 ` Eric Blake
2021-11-17 15:47 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210913151936.392705-1-rjones@redhat.com \
--to=rjones@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).