Apply James' accurate debug patch + use read_record dbglvl everywhere

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

diff --git a/bacula/release-3-status.txt b/bacula/release-3-status.txt
index 6074d1fa2fc136c87d888b91d4fb98df5e5d67bf..9489f359940926e943ca25fe9d7dfb6372be140e 100644 (file)
--- a/bacula/release-3-status.txt
+++ b/bacula/release-3-status.txt
@@ -68,6 +68,7 @@ New features implemented:
 - Win64 File daemon
 - Postmortum dump improvements in SD
 - Deadlock mutex detection in SD
+- Improved Volume management in SD to avoid deadlocks.
 - New configure install options
   --docdir=  (default=/usr/share/doc/bacula-VERSION)
   --htmldir= (default=/usr/share/doc/bacula-VERSION/html -- bat help files)

diff --git a/bacula/src/filed/accurate.c b/bacula/src/filed/accurate.c
index b3435898547fcf9fdbaaa23adffb416be5c0f35f..d7ff0437573a5c3c59bc15a7035703566d5a22d3 100644 (file)
--- a/bacula/src/filed/accurate.c
+++ b/bacula/src/filed/accurate.c
@@ -52,6 +52,9 @@ bool accurate_mark_file_as_seen(JCR *jcr, char *fname)
    CurFile *temp = (CurFile *)jcr->file_list->lookup(fname);
    if (temp) {
       temp->seen = 1;              /* records are in memory */
+      Dmsg1(dbglvl, "marked <%s> as seen\n", fname);
+   } else {
+      Dmsg1(dbglvl, "<%s> not found to be marked as seen\n", fname);
    }
    return true;
 }

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index aa606d08068430b639956c456d3e39cf6c6708ea..df59678082fb75a2da92ed106799828ea9074b60 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -258,10 +258,10 @@ bool read_records(DCR *dcr,
             rec->match_stat = match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec, jcr);
             if (rec->match_stat == -1) { /* no more possible matches */
                done = true;   /* all items found, stop */
-               Dmsg2(100, "All done=(file:block) %u:%u\n", dev->file, dev->block_num);
+               Dmsg2(dbglvl, "All done=(file:block) %u:%u\n", dev->file, dev->block_num);
                break;
             } else if (rec->match_stat == 0) {  /* no match */
-               Dmsg4(100, "BSR no match: clear rem=%d FI=%d before set_eof pos %u:%u\n",
+               Dmsg4(dbglvl, "BSR no match: clear rem=%d FI=%d before set_eof pos %u:%u\n",
                   rec->remainder, rec->FileIndex, dev->file, dev->block_num);
                rec->remainder = 0;
                rec->state &= ~REC_PARTIAL_RECORD;