Fix orphanned jobs (deadlock) while pruning.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7965 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index dba894a8af8d92fe9748f712aeefacf6990e977c..f7f7810c26ab037c2393e6231fd772a8588e398b 100644 (file)
--- 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 2621d3f7ea3272a9c2c491fc56468c56eb455b2e..e1ffb7937f6e55ca0c6d107dfeabdbe3fe31fb90 100644 (file)
--- 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 3dffb4fccfe3974034e14ce544e40915fbc37b48..c74a170d9d33ebf359af7d00af745dfedd39873d 100644 (file)
--- 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.