From 8b56a739058c0ffabf98bf4910fbb33584aeca92 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 29 Mar 2009 09:56:52 +0000 Subject: [PATCH] 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 --- bacula/release-3-status.txt | 1 + bacula/src/filed/accurate.c | 3 +++ bacula/src/stored/read_record.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bacula/release-3-status.txt b/bacula/release-3-status.txt index 6074d1fa2f..9489f35994 100644 --- 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 b343589854..d7ff043757 100644 --- 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 aa606d0806..df59678082 100644 --- 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; -- 2.39.5