|
 |
b87072 |
From 1aa2c06015e15f707ba9f874d5a5ea49fd450745 Mon Sep 17 00:00:00 2001
|
|
|
b87072 |
From: Victor Toso <victortoso@redhat.com>
|
|
|
b87072 |
Date: Wed, 1 Dec 2021 20:07:22 +0100
|
|
|
b87072 |
Subject: [PATCH 20/21] vdagent: udscs: limit retry to connect to vdagentd
|
|
|
b87072 |
|
|
|
b87072 |
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2005802
|
|
|
b87072 |
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2028013
|
|
|
b87072 |
Signed-off-by: Victor Toso <victortoso@redhat.com>
|
|
|
b87072 |
---
|
|
|
b87072 |
src/vdagent/vdagent.c | 21 +++++++++++++++++++++
|
|
|
b87072 |
1 file changed, 21 insertions(+)
|
|
|
b87072 |
|
|
|
b87072 |
diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c
|
|
|
b87072 |
index fd08522..0d3945e 100644
|
|
|
b87072 |
--- a/src/vdagent/vdagent.c
|
|
|
b87072 |
+++ b/src/vdagent/vdagent.c
|
|
|
b87072 |
@@ -42,11 +42,14 @@
|
|
|
b87072 |
#include "clipboard.h"
|
|
|
b87072 |
#include "display.h"
|
|
|
b87072 |
|
|
|
b87072 |
+#define MAX_RETRY_CONNECT_SYSTEM_AGENT 60
|
|
|
b87072 |
+
|
|
|
b87072 |
typedef struct VDAgent {
|
|
|
b87072 |
VDAgentClipboards *clipboards;
|
|
|
b87072 |
VDAgentDisplay *display;
|
|
|
b87072 |
struct vdagent_file_xfers *xfers;
|
|
|
b87072 |
UdscsConnection *conn;
|
|
|
b87072 |
+ gint udscs_num_retry;
|
|
|
b87072 |
|
|
|
b87072 |
GMainLoop *loop;
|
|
|
b87072 |
} VDAgent;
|
|
|
b87072 |
@@ -378,9 +381,27 @@ static gboolean vdagent_init_async_cb(gpointer user_data)
|
|
|
b87072 |
daemon_read_complete, daemon_error_cb,
|
|
|
b87072 |
debug);
|
|
|
b87072 |
if (agent->conn == NULL) {
|
|
|
b87072 |
+ if (agent->udscs_num_retry == MAX_RETRY_CONNECT_SYSTEM_AGENT) {
|
|
|
b87072 |
+ syslog(LOG_WARNING,
|
|
|
b87072 |
+ "Failed to connect to spice-vdagentd at %s (tried %d times)",
|
|
|
b87072 |
+ vdagentd_socket, agent->udscs_num_retry);
|
|
|
b87072 |
+ goto err_init;
|
|
|
b87072 |
+ }
|
|
|
b87072 |
+ if (agent->udscs_num_retry == 0) {
|
|
|
b87072 |
+ /* Log only when it fails and at the end */
|
|
|
b87072 |
+ syslog(LOG_DEBUG,
|
|
|
b87072 |
+ "Failed to connect with spice-vdagentd. Trying again in 1s");
|
|
|
b87072 |
+ }
|
|
|
b87072 |
+ agent->udscs_num_retry++;
|
|
|
b87072 |
g_timeout_add_seconds(1, vdagent_init_async_cb, agent);
|
|
|
b87072 |
return G_SOURCE_REMOVE;
|
|
|
b87072 |
}
|
|
|
b87072 |
+ if (agent->udscs_num_retry != 0) {
|
|
|
b87072 |
+ syslog(LOG_DEBUG,
|
|
|
b87072 |
+ "Connected with spice-vdagentd after %d attempts",
|
|
|
b87072 |
+ agent->udscs_num_retry);
|
|
|
b87072 |
+ }
|
|
|
b87072 |
+ agent->udscs_num_retry = 0;
|
|
|
b87072 |
g_object_set_data(G_OBJECT(agent->conn), "agent", agent);
|
|
|
b87072 |
|
|
|
b87072 |
agent->display = vdagent_display_create(agent->conn, debug, x11_sync);
|
|
|
b87072 |
--
|
|
|
b87072 |
2.33.1
|
|
|
b87072 |
|