|
 |
803fb7 |
From 4c6c21f92a8204abf031e42bb4949a0ecf039f7a Mon Sep 17 00:00:00 2001
|
|
|
803fb7 |
From: David Herrmann <dh.herrmann@gmail.com>
|
|
|
803fb7 |
Date: Wed, 11 Mar 2015 13:53:21 +0100
|
|
|
803fb7 |
Subject: [PATCH] bus-proxy: complain only once about queue overflows
|
|
|
803fb7 |
|
|
|
803fb7 |
If the local peer does not dispatch its incoming queue, the bus-proxy will
|
|
|
803fb7 |
slowly fill its outgoing queue. Once its full, it will continously
|
|
|
803fb7 |
complain that it cannot forward its messages.
|
|
|
803fb7 |
|
|
|
803fb7 |
As it turns out, pulseaudio does have an idle background dbus connection
|
|
|
803fb7 |
that is not integrated into any mainloop (and given that gdbus and
|
|
|
803fb7 |
libdbus1 both support background shared connections, PA is probably not
|
|
|
803fb7 |
the only example), therefore, the bus-proxy will loudly complain if it
|
|
|
803fb7 |
cannot forward NameOwnerChanged events once the queue is full.
|
|
|
803fb7 |
|
|
|
803fb7 |
This commit makes the proxy track queue-state and complain only once the
|
|
|
803fb7 |
queue runs full, not if it is already full.
|
|
|
803fb7 |
|
|
|
803fb7 |
A PA bug-report (and patch) has been filed, and other applications should
|
|
|
803fb7 |
be fixed similarly. Hence, lets keep the error message, instead of
|
|
|
803fb7 |
dropping it. It's unused resources we really want to get rid of, so
|
|
|
803fb7 |
silencing the message does not really help (which is actually what
|
|
|
803fb7 |
dbus-daemon does).
|
|
|
803fb7 |
|
|
|
803fb7 |
(cherry picked from commit ec2c7b56599981a7d9e76b15c75af3e1af3e6f81)
|
|
|
803fb7 |
---
|
|
|
803fb7 |
src/bus-proxyd/proxy.c | 16 ++++++++++++----
|
|
|
803fb7 |
src/bus-proxyd/proxy.h | 1 +
|
|
|
803fb7 |
2 files changed, 13 insertions(+), 4 deletions(-)
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
|
|
|
803fb7 |
index 3dea908f5..e13cf5e2e 100644
|
|
|
803fb7 |
--- a/src/bus-proxyd/proxy.c
|
|
|
803fb7 |
+++ b/src/bus-proxyd/proxy.c
|
|
|
803fb7 |
@@ -729,13 +729,21 @@ static int proxy_process_destination_to_local(Proxy *p) {
|
|
|
803fb7 |
|
|
|
803fb7 |
/* Return the error to the client, if we can */
|
|
|
803fb7 |
synthetic_reply_method_errnof(m, r, "Failed to forward message we got from destination: %m");
|
|
|
803fb7 |
- log_error_errno(r,
|
|
|
803fb7 |
- "Failed to forward message we got from destination: uid=" UID_FMT " gid=" GID_FMT" message=%s destination=%s path=%s interface=%s member=%s: %m",
|
|
|
803fb7 |
- p->local_creds.uid, p->local_creds.gid, bus_message_type_to_string(m->header->type),
|
|
|
803fb7 |
- strna(m->destination), strna(m->path), strna(m->interface), strna(m->member));
|
|
|
803fb7 |
+ if (r == -ENOBUFS) {
|
|
|
803fb7 |
+ /* if local dbus1 peer does not dispatch its queue, warn only once */
|
|
|
803fb7 |
+ if (!p->queue_overflow)
|
|
|
803fb7 |
+ log_error("Dropped messages due to queue overflow of local peer (pid: "PID_FMT" uid: "UID_FMT")", p->local_creds.pid, p->local_creds.uid);
|
|
|
803fb7 |
+ p->queue_overflow = true;
|
|
|
803fb7 |
+ } else
|
|
|
803fb7 |
+ log_error_errno(r,
|
|
|
803fb7 |
+ "Failed to forward message we got from destination: uid=" UID_FMT " gid=" GID_FMT" message=%s destination=%s path=%s interface=%s member=%s: %m",
|
|
|
803fb7 |
+ p->local_creds.uid, p->local_creds.gid, bus_message_type_to_string(m->header->type),
|
|
|
803fb7 |
+ strna(m->destination), strna(m->path), strna(m->interface), strna(m->member));
|
|
|
803fb7 |
+
|
|
|
803fb7 |
return 1;
|
|
|
803fb7 |
}
|
|
|
803fb7 |
|
|
|
803fb7 |
+ p->queue_overflow = false;
|
|
|
803fb7 |
return 1;
|
|
|
803fb7 |
}
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h
|
|
|
803fb7 |
index 913d47071..782c4e60b 100644
|
|
|
803fb7 |
--- a/src/bus-proxyd/proxy.h
|
|
|
803fb7 |
+++ b/src/bus-proxyd/proxy.h
|
|
|
803fb7 |
@@ -40,6 +40,7 @@ struct Proxy {
|
|
|
803fb7 |
SharedPolicy *policy;
|
|
|
803fb7 |
|
|
|
803fb7 |
bool got_hello : 1;
|
|
|
803fb7 |
+ bool queue_overflow : 1;
|
|
|
803fb7 |
};
|
|
|
803fb7 |
|
|
|
803fb7 |
int proxy_new(Proxy **out, int in_fd, int out_fd, const char *dest);
|