From fb9ceeac0166c81a489764a6289b3cb155302798 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 2 Nov 2008 13:39:44 +0000 Subject: [PATCH] Fix orphanned jobs (deadlock) while pruning. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7965 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/job.c | 1 + bacula/src/dird/ua_prune.c | 1 + bacula/technotes-2.5 | 1 + 3 files changed, 3 insertions(+) diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index dba894a8af..f7f7810c26 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -696,6 +696,7 @@ bool allow_duplicate_job(JCR *jcr) } } } + endeach_jcr(djcr); } return true; } diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c index 2621d3f7ea..e1ffb7937f 100644 --- a/bacula/src/dird/ua_prune.c +++ b/bacula/src/dird/ua_prune.c @@ -508,6 +508,7 @@ int get_prune_list_for_volume(UAContext *ua, MEDIA_DBR *mr, del_ctx *del) break; } } + endeach_jcr(jcr); if (skip) { continue; } diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 3dffb4fccf..c74a170d9d 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -11,6 +11,7 @@ mixed priorities General: 02Nov08 +kes Fix orphanned jobs (deadlock) while pruning. kes Use jcr stored in bsock rather than searching in getmsg.c. This results in about a 5% speed improvement with four concurrent jobs. -- 2.39.5