From c0fd51abd2cf8d01ced6a1e585ab399761b21508 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 17 Feb 2010 14:18:11 +0100 Subject: [PATCH] Add debug code for FreeBSD regress failures --- bacula/src/lib/lockmgr.c | 2 +- bacula/src/stored/mount.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c index 19db323fcd..97e99889ef 100644 --- a/bacula/src/lib/lockmgr.c +++ b/bacula/src/lib/lockmgr.c @@ -577,7 +577,7 @@ void *check_deadlock(void *) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old); pthread_testcancel(); } - Pmsg0(000, "Undertaker is leaving...\n"); + Dmsg0(100, "Exit check_deadlock.\n"); pthread_cleanup_pop(1); return NULL; } diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c index 9e0987a3a3..6ad3f9c5b8 100644 --- a/bacula/src/stored/mount.c +++ b/bacula/src/stored/mount.c @@ -280,7 +280,7 @@ read_volume: VolumeName); if (!dev->eod(dcr)) { - Dmsg2(150, "Unable to position to end of data on device %s: ERR=%s\n", + Dmsg2(050, "Unable to position to end of data on device %s: ERR=%s\n", dev->print_name(), dev->bstrerror()); Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data on device %s: ERR=%s\n"), dev->print_name(), dev->bstrerror()); @@ -288,7 +288,7 @@ read_volume: goto mount_next_vol; } if (!is_eod_valid()) { - Dmsg0(150, "goto mount_next_vol\n"); + Dmsg0(100, "goto mount_next_vol\n"); goto mount_next_vol; } @@ -618,11 +618,13 @@ bool DCR::is_eod_valid() " size=%s\n"), VolumeName, edit_uint64(dev->VolCatInfo.VolCatBytes, ed1)); } else { - Jmsg(jcr, M_ERROR, 0, _("Bacula cannot write on disk Volume \"%s\" because: " + Mmsg(jcr->errmsg, _("Bacula cannot write on disk Volume \"%s\" because: " "The sizes do not match! Volume=%s Catalog=%s\n"), VolumeName, edit_uint64(pos, ed1), edit_uint64(dev->VolCatInfo.VolCatBytes, ed2)); + Jmsg(jcr, M_ERROR, 0, jcr->errmsg); + Dmsg0(050, jcr->errmsg); mark_volume_in_error(); return false; } -- 2.39.5