From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 15 Nov 2017 10:16:25 +0000 (+0100)
Subject: Add temporary fix to avoid a deadlock after a reload command on an incorrect configur... 
X-Git-Tag: Release-9.0.6~6
X-Git-Url: https://git.sur5r.net/?p=bacula%2Fbacula;a=commitdiff_plain;h=5fdde77b03110df59baeda81488677e502433794

Add temporary fix to avoid a deadlock after a reload command on an incorrect configuration
---

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 44a7dc1e40..cfb8388609 100644
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -834,10 +834,18 @@ void dispatch_message(JCR *jcr, int type, utime_t mtime, char *msg)
     if (!jcr) {
        jcr = get_jcr_from_tsd();
     }
+
+/* Temporary fix for a deadlock in the reload command when
+ * the configuration has a problem. The JCR chain is locked
+ * during the reload, we cannot create a new JCR.
+ */
+#if 0
     if (!jcr) {
        jcr = new_jcr(sizeof(JCR), NULL);
        created_jcr = true;
     }
+#endif
+
     if (jcr) {
        msgs = jcr->jcr_msgs;
     }