|
 |
9b05798 |
From 04c1909a0c1c13eee10141f08eff2048decc2e49 Mon Sep 17 00:00:00 2001
|
|
|
9b05798 |
From: Adam Williamson <awilliam@redhat.com>
|
|
|
9b05798 |
Date: Wed, 12 Dec 2018 22:28:15 -0800
|
|
|
9b05798 |
Subject: [PATCH] sbus: use 120 second default timeout
|
|
|
9b05798 |
|
|
|
9b05798 |
As discussed in #1654537, first login to a system as a FreeIPA
|
|
|
9b05798 |
domain user now usually causes an expensive SELinux operation
|
|
|
9b05798 |
to happen; this can take longer than the default bus message
|
|
|
9b05798 |
timeout of 25 seconds. To deal with this for now, let's use a
|
|
|
9b05798 |
120 second default timeout; this is a big hammer, but unless we
|
|
|
9b05798 |
can refactor things to use a longer timeout just for that one
|
|
|
9b05798 |
call, or make the actual operation take less time, there's not
|
|
|
9b05798 |
much else we can do.
|
|
|
9b05798 |
|
|
|
9b05798 |
Resolves:
|
|
|
9b05798 |
https://bugzilla.redhat.com/show_bug.cgi?id=1654537
|
|
|
9b05798 |
|
|
|
9b05798 |
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
|
9b05798 |
---
|
|
|
9b05798 |
src/sbus/sbus_message.h | 6 ++++--
|
|
|
9b05798 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
9b05798 |
|
|
|
9b05798 |
diff --git a/src/sbus/sbus_message.h b/src/sbus/sbus_message.h
|
|
|
9b05798 |
index e7b8fe594..7ae634ece 100644
|
|
|
9b05798 |
--- a/src/sbus/sbus_message.h
|
|
|
9b05798 |
+++ b/src/sbus/sbus_message.h
|
|
|
9b05798 |
@@ -27,8 +27,10 @@
|
|
|
9b05798 |
#include "util/util.h"
|
|
|
9b05798 |
#include "sbus/sbus_errors.h"
|
|
|
9b05798 |
|
|
|
9b05798 |
-/* Use reasonable default timeout which is computed in libdbus */
|
|
|
9b05798 |
-#define SBUS_MESSAGE_TIMEOUT -1
|
|
|
9b05798 |
+/* Use longer default timeout than libdbus default due to expensive
|
|
|
9b05798 |
+ * selinux operation: see https://bugzilla.redhat.com/show_bug.cgi?id=1654537
|
|
|
9b05798 |
+ */
|
|
|
9b05798 |
+#define SBUS_MESSAGE_TIMEOUT 120000
|
|
|
9b05798 |
|
|
|
9b05798 |
/**
|
|
|
9b05798 |
* Bound message with a talloc context.
|
|
|
9b05798 |
--
|
|
|
9b05798 |
2.20.0
|
|
|
9b05798 |
|