daandemeyer / rpms / systemd

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